webbuilder_pel7x64builder0
5 years ago
18 changed files with 4335 additions and 25 deletions
@ -0,0 +1,28 @@ |
|||||||
|
Disable MPM detection |
||||||
|
|
||||||
|
mod_php is build twice |
||||||
|
- as NTS without option |
||||||
|
- as ZTS using --enable-maintainer-zts |
||||||
|
|
||||||
|
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 |
||||||
|
index 2e64b21..ec4799f 100644 |
||||||
|
--- a/sapi/apache2handler/config.m4 |
||||||
|
+++ b/sapi/apache2handler/config.m4 |
||||||
|
@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then |
||||||
|
;; |
||||||
|
esac |
||||||
|
|
||||||
|
- if test "$APACHE_VERSION" -lt 2004001; then |
||||||
|
- APXS_MPM=`$APXS -q MPM_NAME` |
||||||
|
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then |
||||||
|
- PHP_BUILD_THREAD_SAFE |
||||||
|
- fi |
||||||
|
- else |
||||||
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` |
||||||
|
- if test -n "$APACHE_THREADED_MPM"; then |
||||||
|
- PHP_BUILD_THREAD_SAFE |
||||||
|
- fi |
||||||
|
- fi |
||||||
|
AC_MSG_RESULT(yes) |
||||||
|
PHP_SUBST(APXS) |
||||||
|
else |
@ -0,0 +1,11 @@ |
|||||||
|
--- php-7.2.0/configure.ac.includedir |
||||||
|
+++ php-7.2.0/configure.ac |
||||||
|
@@ -1230,7 +1230,7 @@ |
||||||
|
EXPANDED_DATADIR=$datadir |
||||||
|
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` |
||||||
|
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` |
||||||
|
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR |
||||||
|
+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php |
||||||
|
|
||||||
|
exec_prefix=$old_exec_prefix |
||||||
|
libdir=$old_libdir |
@ -0,0 +1,92 @@ |
|||||||
|
diff -up php-7.2.0alpha0/ext/dba/config.m4.libdb php-7.2.0alpha0/ext/dba/config.m4 |
||||||
|
--- php-7.2.0alpha0/ext/dba/config.m4.libdb 2017-05-29 08:56:06.000000000 +0200 |
||||||
|
+++ php-7.2.0alpha0/ext/dba/config.m4 2017-05-29 09:13:52.014823282 +0200 |
||||||
|
@@ -346,61 +346,13 @@ if test "$PHP_DB4" != "no"; then |
||||||
|
dbdp4="/usr/local/BerkeleyDB.4." |
||||||
|
dbdp5="/usr/local/BerkeleyDB.5." |
||||||
|
for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do |
||||||
|
- if test -f "$i/db5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.3/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.3/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.1/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.1/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.0/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.0/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.8/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.8/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.7/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.7/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.6/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.6/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db.h"; then |
||||||
|
+ if test -f "$i/include/db.h"; then |
||||||
|
THIS_PREFIX=$i |
||||||
|
THIS_INCLUDE=$i/include/db.h |
||||||
|
break |
||||||
|
fi |
||||||
|
done |
||||||
|
- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
fi |
||||||
|
PHP_DBA_STD_RESULT(db4,Berkeley DB4) |
||||||
|
|
||||||
|
diff -up php-7.2.0alpha0/ext/dba/dba.c.libdb php-7.2.0alpha0/ext/dba/dba.c |
||||||
|
--- php-7.2.0alpha0/ext/dba/dba.c.libdb 2017-05-29 09:16:15.736628202 +0200 |
||||||
|
+++ php-7.2.0alpha0/ext/dba/dba.c 2017-05-29 09:16:20.494654746 +0200 |
||||||
|
@@ -53,6 +53,10 @@ |
||||||
|
#include "php_tcadb.h" |
||||||
|
#include "php_lmdb.h" |
||||||
|
|
||||||
|
+#ifdef DB4_INCLUDE_FILE |
||||||
|
+#include DB4_INCLUDE_FILE |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
/* {{{ arginfo */ |
||||||
|
ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) |
||||||
|
ZEND_ARG_INFO(0, path) |
||||||
|
@@ -558,6 +562,10 @@ PHP_MINFO_FUNCTION(dba) |
||||||
|
|
||||||
|
php_info_print_table_start(); |
||||||
|
php_info_print_table_row(2, "DBA support", "enabled"); |
||||||
|
+#ifdef DB_VERSION_STRING |
||||||
|
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); |
||||||
|
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); |
||||||
|
+#endif |
||||||
|
if (handlers.s) { |
||||||
|
smart_str_0(&handlers); |
||||||
|
php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); |
@ -0,0 +1,35 @@ |
|||||||
|
diff -up php-7.2.12RC1/scripts/phpize.in.headers php-7.2.12RC1/scripts/phpize.in |
||||||
|
--- php-7.2.12RC1/scripts/phpize.in.headers 2018-10-23 11:47:43.000000000 +0200 |
||||||
|
+++ php-7.2.12RC1/scripts/phpize.in 2018-10-23 11:49:51.651818777 +0200 |
||||||
|
@@ -162,6 +162,15 @@ phpize_autotools() |
||||||
|
$PHP_AUTOHEADER || exit 1 |
||||||
|
} |
||||||
|
|
||||||
|
+phpize_check_headers() |
||||||
|
+{ |
||||||
|
+ if test ! -f $includedir/main/php.h; then |
||||||
|
+ echo "Can't find PHP headers in $includedir" |
||||||
|
+ echo "The php-devel package is required for use of this command." |
||||||
|
+ exit 1 |
||||||
|
+ fi |
||||||
|
+} |
||||||
|
+ |
||||||
|
# Main script |
||||||
|
|
||||||
|
case "$1" in |
||||||
|
@@ -180,12 +189,15 @@ case "$1" in |
||||||
|
|
||||||
|
# Version |
||||||
|
--version|-v) |
||||||
|
+ phpize_check_headers |
||||||
|
phpize_print_api_numbers |
||||||
|
exit 0 |
||||||
|
;; |
||||||
|
|
||||||
|
# Default |
||||||
|
*) |
||||||
|
+ phpize_check_headers |
||||||
|
+ |
||||||
|
phpize_check_configm4 0 |
||||||
|
|
||||||
|
phpize_check_build_files |
@ -0,0 +1,18 @@ |
|||||||
|
|
||||||
|
Use -lldap_r by default. |
||||||
|
|
||||||
|
diff -up php-7.2.3RC1/ext/ldap/config.m4.ldap_r php-7.2.3RC1/ext/ldap/config.m4 |
||||||
|
--- php-7.2.3RC1/ext/ldap/config.m4.ldap_r 2018-02-14 06:05:11.553142812 +0100 |
||||||
|
+++ php-7.2.3RC1/ext/ldap/config.m4 2018-02-14 06:07:31.179816122 +0100 |
||||||
|
@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then |
||||||
|
|
||||||
|
MACHINE_INCLUDES=$($CC -dumpmachine) |
||||||
|
|
||||||
|
- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then |
||||||
|
+ if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then |
||||||
|
+ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) |
||||||
|
+ PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) |
||||||
|
+ |
||||||
|
+ elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then |
||||||
|
PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) |
||||||
|
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) |
@ -0,0 +1,654 @@ |
|||||||
|
# License: MIT |
||||||
|
# http://opensource.org/licenses/MIT |
||||||
|
|
||||||
|
Add support for use of the system timezone database, rather |
||||||
|
than embedding a copy. Discussed upstream but was not desired. |
||||||
|
|
||||||
|
History: |
||||||
|
r16: adapt for timelib 2017.06 (in 7.2.3RC1) |
||||||
|
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) |
||||||
|
r14: improve check for valid tz file |
||||||
|
r13: adapt for upstream changes to use PHP allocator |
||||||
|
r12: adapt for upstream changes for new zic |
||||||
|
r11: use canonical names to avoid more case sensitivity issues |
||||||
|
round lat/long from zone.tab towards zero per builtin db |
||||||
|
r10: make timezone case insensitive |
||||||
|
r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold) |
||||||
|
r8: fix compile error without --with-system-tzdata configured |
||||||
|
r7: improve check for valid timezone id to exclude directories |
||||||
|
r6: fix fd leak in r5, fix country code/BC flag use in |
||||||
|
timezone_identifiers_list() using system db, |
||||||
|
fix use of PECL timezonedb to override system db, |
||||||
|
r5: reverts addition of "System/Localtime" fake tzname. |
||||||
|
updated for 5.3.0, parses zone.tab to pick up mapping between |
||||||
|
timezone name, country code and long/lat coords |
||||||
|
r4: added "System/Localtime" tzname which uses /etc/localtime |
||||||
|
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) |
||||||
|
r2: add filesystem trawl to set up name alias index |
||||||
|
r1: initial revision |
||||||
|
|
||||||
|
diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/lib/parse_tz.c |
||||||
|
--- php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata 2018-02-13 20:18:34.000000000 +0100 |
||||||
|
+++ php-7.2.3RC1/ext/date/lib/parse_tz.c 2018-02-14 06:14:23.484804852 +0100 |
||||||
|
@@ -25,8 +25,21 @@ |
||||||
|
#include "timelib.h" |
||||||
|
#include "timelib_private.h" |
||||||
|
|
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+#include <sys/mman.h> |
||||||
|
+#include <sys/stat.h> |
||||||
|
+#include <limits.h> |
||||||
|
+#include <fcntl.h> |
||||||
|
+#include <unistd.h> |
||||||
|
+ |
||||||
|
+#include "php_scandir.h" |
||||||
|
+ |
||||||
|
+#else |
||||||
|
#define TIMELIB_SUPPORTS_V2DATA |
||||||
|
#include "timezonedb.h" |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+#include <ctype.h> |
||||||
|
|
||||||
|
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) |
||||||
|
# if defined(__LITTLE_ENDIAN__) |
||||||
|
@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig |
||||||
|
{ |
||||||
|
uint32_t version; |
||||||
|
|
||||||
|
+ if (memcmp(*tzf, "TZif", 4) == 0) { |
||||||
|
+ *tzf += 20; |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
/* read ID */ |
||||||
|
version = (*tzf)[3] - '0'; |
||||||
|
*tzf += 4; |
||||||
|
@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA_PREFIX |
||||||
|
+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX |
||||||
|
+#else |
||||||
|
+#define ZONEINFO_PREFIX "/usr/share/zoneinfo" |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+/* System timezone database pointer. */ |
||||||
|
+static const timelib_tzdb *timezonedb_system; |
||||||
|
+ |
||||||
|
+/* Hash table entry for the cache of the zone.tab mapping table. */ |
||||||
|
+struct location_info { |
||||||
|
+ char code[2]; |
||||||
|
+ double latitude, longitude; |
||||||
|
+ char name[64]; |
||||||
|
+ char *comment; |
||||||
|
+ struct location_info *next; |
||||||
|
+}; |
||||||
|
+ |
||||||
|
+/* Cache of zone.tab. */ |
||||||
|
+static struct location_info **system_location_table; |
||||||
|
+ |
||||||
|
+/* Size of the zone.tab hash table; a random-ish prime big enough to |
||||||
|
+ * prevent too many collisions. */ |
||||||
|
+#define LOCINFO_HASH_SIZE (1021) |
||||||
|
+ |
||||||
|
+/* Compute a case insensitive hash of str */ |
||||||
|
+static uint32_t tz_hash(const char *str) |
||||||
|
+{ |
||||||
|
+ const unsigned char *p = (const unsigned char *)str; |
||||||
|
+ uint32_t hash = 5381; |
||||||
|
+ int c; |
||||||
|
+ |
||||||
|
+ while ((c = tolower(*p++)) != '\0') { |
||||||
|
+ hash = (hash << 5) ^ hash ^ c; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return hash % LOCINFO_HASH_SIZE; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the |
||||||
|
+ * parsed string on success, or NULL on parse error. On success, |
||||||
|
+ * writes the parsed number to *result. */ |
||||||
|
+static char *parse_iso6709(char *p, double *result) |
||||||
|
+{ |
||||||
|
+ double v, sign; |
||||||
|
+ char *pend; |
||||||
|
+ size_t len; |
||||||
|
+ |
||||||
|
+ if (*p == '+') |
||||||
|
+ sign = 1.0; |
||||||
|
+ else if (*p == '-') |
||||||
|
+ sign = -1.0; |
||||||
|
+ else |
||||||
|
+ return NULL; |
||||||
|
+ |
||||||
|
+ p++; |
||||||
|
+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) |
||||||
|
+ ;; |
||||||
|
+ |
||||||
|
+ /* Annoying encoding used by zone.tab has no decimal point, so use |
||||||
|
+ * the length to determine the format: |
||||||
|
+ * |
||||||
|
+ * 4 = DDMM |
||||||
|
+ * 5 = DDDMM |
||||||
|
+ * 6 = DDMMSS |
||||||
|
+ * 7 = DDDMMSS |
||||||
|
+ */ |
||||||
|
+ len = pend - p; |
||||||
|
+ if (len < 4 || len > 7) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* p => [D]DD */ |
||||||
|
+ v = (p[0] - '0') * 10.0 + (p[1] - '0'); |
||||||
|
+ p += 2; |
||||||
|
+ if (len == 5 || len == 7) |
||||||
|
+ v = v * 10.0 + (*p++ - '0'); |
||||||
|
+ /* p => MM[SS] */ |
||||||
|
+ v += (10.0 * (p[0] - '0') |
||||||
|
+ + p[1] - '0') / 60.0; |
||||||
|
+ p += 2; |
||||||
|
+ /* p => [SS] */ |
||||||
|
+ if (len > 5) { |
||||||
|
+ v += (10.0 * (p[0] - '0') |
||||||
|
+ + p[1] - '0') / 3600.0; |
||||||
|
+ p += 2; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* Round to five decimal place, not because it's a good idea, |
||||||
|
+ * but, because the builtin data uses rounded data, so, match |
||||||
|
+ * that. */ |
||||||
|
+ *result = trunc(v * sign * 100000.0) / 100000.0; |
||||||
|
+ |
||||||
|
+ return p; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* This function parses the zone.tab file to build up the mapping of |
||||||
|
+ * timezone to country code and geographic location, and returns a |
||||||
|
+ * hash table. The hash table is indexed by the function: |
||||||
|
+ * |
||||||
|
+ * tz_hash(timezone-name) |
||||||
|
+ */ |
||||||
|
+static struct location_info **create_location_table(void) |
||||||
|
+{ |
||||||
|
+ struct location_info **li, *i; |
||||||
|
+ char zone_tab[PATH_MAX]; |
||||||
|
+ char line[512]; |
||||||
|
+ FILE *fp; |
||||||
|
+ |
||||||
|
+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); |
||||||
|
+ |
||||||
|
+ fp = fopen(zone_tab, "r"); |
||||||
|
+ if (!fp) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); |
||||||
|
+ |
||||||
|
+ while (fgets(line, sizeof line, fp)) { |
||||||
|
+ char *p = line, *code, *name, *comment; |
||||||
|
+ uint32_t hash; |
||||||
|
+ double latitude, longitude; |
||||||
|
+ |
||||||
|
+ while (isspace(*p)) |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ if (*p == '#' || *p == '\0' || *p == '\n') |
||||||
|
+ continue; |
||||||
|
+ |
||||||
|
+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') |
||||||
|
+ continue; |
||||||
|
+ |
||||||
|
+ /* code => AA */ |
||||||
|
+ code = p; |
||||||
|
+ p[2] = 0; |
||||||
|
+ p += 3; |
||||||
|
+ |
||||||
|
+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ |
||||||
|
+ p = parse_iso6709(p, &latitude); |
||||||
|
+ if (!p) { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ p = parse_iso6709(p, &longitude); |
||||||
|
+ if (!p) { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (!p || *p != '\t') { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* name = string */ |
||||||
|
+ name = ++p; |
||||||
|
+ while (*p != '\t' && *p && *p != '\n') |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ *p++ = '\0'; |
||||||
|
+ |
||||||
|
+ /* comment = string */ |
||||||
|
+ comment = p; |
||||||
|
+ while (*p != '\t' && *p && *p != '\n') |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ if (*p == '\n' || *p == '\t') |
||||||
|
+ *p = '\0'; |
||||||
|
+ |
||||||
|
+ hash = tz_hash(name); |
||||||
|
+ i = malloc(sizeof *i); |
||||||
|
+ memcpy(i->code, code, 2); |
||||||
|
+ strncpy(i->name, name, sizeof i->name); |
||||||
|
+ i->comment = strdup(comment); |
||||||
|
+ i->longitude = longitude; |
||||||
|
+ i->latitude = latitude; |
||||||
|
+ i->next = li[hash]; |
||||||
|
+ li[hash] = i; |
||||||
|
+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ fclose(fp); |
||||||
|
+ |
||||||
|
+ return li; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Return location info from hash table, using given timezone name. |
||||||
|
+ * Returns NULL if the name could not be found. */ |
||||||
|
+const struct location_info *find_zone_info(struct location_info **li, |
||||||
|
+ const char *name) |
||||||
|
+{ |
||||||
|
+ uint32_t hash = tz_hash(name); |
||||||
|
+ const struct location_info *l; |
||||||
|
+ |
||||||
|
+ if (!li) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ for (l = li[hash]; l; l = l->next) { |
||||||
|
+ if (timelib_strcasecmp(l->name, name) == 0) |
||||||
|
+ return l; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Filter out some non-tzdata files and the posix/right databases, if |
||||||
|
+ * present. */ |
||||||
|
+static int index_filter(const struct dirent *ent) |
||||||
|
+{ |
||||||
|
+ return strcmp(ent->d_name, ".") != 0 |
||||||
|
+ && strcmp(ent->d_name, "..") != 0 |
||||||
|
+ && strcmp(ent->d_name, "posix") != 0 |
||||||
|
+ && strcmp(ent->d_name, "posixrules") != 0 |
||||||
|
+ && strcmp(ent->d_name, "right") != 0 |
||||||
|
+ && strstr(ent->d_name, ".list") == NULL |
||||||
|
+ && strstr(ent->d_name, ".tab") == NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+static int sysdbcmp(const void *first, const void *second) |
||||||
|
+{ |
||||||
|
+ const timelib_tzdb_index_entry *alpha = first, *beta = second; |
||||||
|
+ |
||||||
|
+ return timelib_strcasecmp(alpha->id, beta->id); |
||||||
|
+} |
||||||
|
+ |
||||||
|
+ |
||||||
|
+/* Create the zone identifier index by trawling the filesystem. */ |
||||||
|
+static void create_zone_index(timelib_tzdb *db) |
||||||
|
+{ |
||||||
|
+ size_t dirstack_size, dirstack_top; |
||||||
|
+ size_t index_size, index_next; |
||||||
|
+ timelib_tzdb_index_entry *db_index; |
||||||
|
+ char **dirstack; |
||||||
|
+ |
||||||
|
+ /* LIFO stack to hold directory entries to scan; each slot is a |
||||||
|
+ * directory name relative to the zoneinfo prefix. */ |
||||||
|
+ dirstack_size = 32; |
||||||
|
+ dirstack = malloc(dirstack_size * sizeof *dirstack); |
||||||
|
+ dirstack_top = 1; |
||||||
|
+ dirstack[0] = strdup(""); |
||||||
|
+ |
||||||
|
+ /* Index array. */ |
||||||
|
+ index_size = 64; |
||||||
|
+ db_index = malloc(index_size * sizeof *db_index); |
||||||
|
+ index_next = 0; |
||||||
|
+ |
||||||
|
+ do { |
||||||
|
+ struct dirent **ents; |
||||||
|
+ char name[PATH_MAX], *top; |
||||||
|
+ int count; |
||||||
|
+ |
||||||
|
+ /* Pop the top stack entry, and iterate through its contents. */ |
||||||
|
+ top = dirstack[--dirstack_top]; |
||||||
|
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); |
||||||
|
+ |
||||||
|
+ count = php_scandir(name, &ents, index_filter, php_alphasort); |
||||||
|
+ |
||||||
|
+ while (count > 0) { |
||||||
|
+ struct stat st; |
||||||
|
+ const char *leaf = ents[count - 1]->d_name; |
||||||
|
+ |
||||||
|
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", |
||||||
|
+ top, leaf); |
||||||
|
+ |
||||||
|
+ if (strlen(name) && stat(name, &st) == 0) { |
||||||
|
+ /* Name, relative to the zoneinfo prefix. */ |
||||||
|
+ const char *root = top; |
||||||
|
+ |
||||||
|
+ if (root[0] == '/') root++; |
||||||
|
+ |
||||||
|
+ snprintf(name, sizeof name, "%s%s%s", root, |
||||||
|
+ *root ? "/": "", leaf); |
||||||
|
+ |
||||||
|
+ if (S_ISDIR(st.st_mode)) { |
||||||
|
+ if (dirstack_top == dirstack_size) { |
||||||
|
+ dirstack_size *= 2; |
||||||
|
+ dirstack = realloc(dirstack, |
||||||
|
+ dirstack_size * sizeof *dirstack); |
||||||
|
+ } |
||||||
|
+ dirstack[dirstack_top++] = strdup(name); |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ if (index_next == index_size) { |
||||||
|
+ index_size *= 2; |
||||||
|
+ db_index = realloc(db_index, |
||||||
|
+ index_size * sizeof *db_index); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ db_index[index_next++].id = strdup(name); |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ free(ents[--count]); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (count != -1) free(ents); |
||||||
|
+ free(top); |
||||||
|
+ } while (dirstack_top); |
||||||
|
+ |
||||||
|
+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); |
||||||
|
+ |
||||||
|
+ db->index = db_index; |
||||||
|
+ db->index_size = index_next; |
||||||
|
+ |
||||||
|
+ free(dirstack); |
||||||
|
+} |
||||||
|
+ |
||||||
|
+#define FAKE_HEADER "1234\0??\1??" |
||||||
|
+#define FAKE_UTC_POS (7 - 4) |
||||||
|
+ |
||||||
|
+/* Create a fake data segment for database 'sysdb'. */ |
||||||
|
+static void fake_data_segment(timelib_tzdb *sysdb, |
||||||
|
+ struct location_info **info) |
||||||
|
+{ |
||||||
|
+ size_t n; |
||||||
|
+ char *data, *p; |
||||||
|
+ |
||||||
|
+ data = malloc(3 * sysdb->index_size + 7); |
||||||
|
+ |
||||||
|
+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); |
||||||
|
+ |
||||||
|
+ for (n = 0; n < sysdb->index_size; n++) { |
||||||
|
+ const struct location_info *li; |
||||||
|
+ timelib_tzdb_index_entry *ent; |
||||||
|
+ |
||||||
|
+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; |
||||||
|
+ |
||||||
|
+ /* Lookup the timezone name in the hash table. */ |
||||||
|
+ if (strcmp(ent->id, "UTC") == 0) { |
||||||
|
+ ent->pos = FAKE_UTC_POS; |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ li = find_zone_info(info, ent->id); |
||||||
|
+ if (li) { |
||||||
|
+ /* If found, append the BC byte and the |
||||||
|
+ * country code; set the position for this |
||||||
|
+ * section of timezone data. */ |
||||||
|
+ ent->pos = (p - data) - 4; |
||||||
|
+ *p++ = '\1'; |
||||||
|
+ *p++ = li->code[0]; |
||||||
|
+ *p++ = li->code[1]; |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ /* If not found, the timezone data can |
||||||
|
+ * point at the header. */ |
||||||
|
+ ent->pos = 0; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ sysdb->data = (unsigned char *)data; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Returns true if the passed-in stat structure describes a |
||||||
|
+ * probably-valid timezone file. */ |
||||||
|
+static int is_valid_tzfile(const struct stat *st, int fd) |
||||||
|
+{ |
||||||
|
+ if (fd) { |
||||||
|
+ char buf[20]; |
||||||
|
+ if (read(fd, buf, 20)!=20) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ lseek(fd, SEEK_SET, 0); |
||||||
|
+ if (memcmp(buf, "TZif", 4)) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ return S_ISREG(st->st_mode) && st->st_size > 20; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* To allow timezone names to be used case-insensitively, find the |
||||||
|
+ * canonical name for this timezone, if possible. */ |
||||||
|
+static const char *canonical_tzname(const char *timezone) |
||||||
|
+{ |
||||||
|
+ if (timezonedb_system) { |
||||||
|
+ timelib_tzdb_index_entry *ent, lookup; |
||||||
|
+ |
||||||
|
+ lookup.id = (char *)timezone; |
||||||
|
+ |
||||||
|
+ ent = bsearch(&lookup, timezonedb_system->index, |
||||||
|
+ timezonedb_system->index_size, sizeof lookup, |
||||||
|
+ sysdbcmp); |
||||||
|
+ if (ent) { |
||||||
|
+ return ent->id; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return timezone; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Return the mmap()ed tzfile if found, else NULL. On success, the |
||||||
|
+ * length of the mapped data is placed in *length. */ |
||||||
|
+static char *map_tzfile(const char *timezone, size_t *length) |
||||||
|
+{ |
||||||
|
+ char fname[PATH_MAX]; |
||||||
|
+ struct stat st; |
||||||
|
+ char *p; |
||||||
|
+ int fd; |
||||||
|
+ |
||||||
|
+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); |
||||||
|
+ |
||||||
|
+ fd = open(fname, O_RDONLY); |
||||||
|
+ if (fd == -1) { |
||||||
|
+ return NULL; |
||||||
|
+ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) { |
||||||
|
+ close(fd); |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ *length = st.st_size; |
||||||
|
+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); |
||||||
|
+ close(fd); |
||||||
|
+ |
||||||
|
+ return p != MAP_FAILED ? p : NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) |
||||||
|
{ |
||||||
|
int left = 0, right = tzdb->index_size - 1; |
||||||
|
|
||||||
|
@@ -400,9 +840,48 @@ static int seek_to_tz_position(const uns |
||||||
|
return 0; |
||||||
|
} |
||||||
|
|
||||||
|
+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, |
||||||
|
+ char **map, size_t *maplen, |
||||||
|
+ const timelib_tzdb *tzdb) |
||||||
|
+{ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (tzdb == timezonedb_system) { |
||||||
|
+ char *orig; |
||||||
|
+ |
||||||
|
+ orig = map_tzfile(timezone, maplen); |
||||||
|
+ if (orig == NULL) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ (*tzf) = (unsigned char *)orig; |
||||||
|
+ *map = orig; |
||||||
|
+ return 1; |
||||||
|
+ } |
||||||
|
+ else |
||||||
|
+#endif |
||||||
|
+ { |
||||||
|
+ return inmem_seek_to_tz_position(tzf, timezone, tzdb); |
||||||
|
+ } |
||||||
|
+} |
||||||
|
+ |
||||||
|
const timelib_tzdb *timelib_builtin_db(void) |
||||||
|
{ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (timezonedb_system == NULL) { |
||||||
|
+ timelib_tzdb *tmp = malloc(sizeof *tmp); |
||||||
|
+ |
||||||
|
+ tmp->version = "0.system"; |
||||||
|
+ tmp->data = NULL; |
||||||
|
+ create_zone_index(tmp); |
||||||
|
+ system_location_table = create_location_table(); |
||||||
|
+ fake_data_segment(tmp, system_location_table); |
||||||
|
+ timezonedb_system = tmp; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return timezonedb_system; |
||||||
|
+#else |
||||||
|
return &timezonedb_builtin; |
||||||
|
+#endif |
||||||
|
} |
||||||
|
|
||||||
|
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) |
||||||
|
@@ -414,7 +893,30 @@ const timelib_tzdb_index_entry *timelib_ |
||||||
|
int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) |
||||||
|
{ |
||||||
|
const unsigned char *tzf; |
||||||
|
- return (seek_to_tz_position(&tzf, timezone, tzdb)); |
||||||
|
+ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (tzdb == timezonedb_system) { |
||||||
|
+ char fname[PATH_MAX]; |
||||||
|
+ struct stat st; |
||||||
|
+ |
||||||
|
+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (system_location_table) { |
||||||
|
+ if (find_zone_info(system_location_table, timezone) != NULL) { |
||||||
|
+ /* found in cache */ |
||||||
|
+ return 1; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); |
||||||
|
+ |
||||||
|
+ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0); |
||||||
|
+ } |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); |
||||||
|
} |
||||||
|
|
||||||
|
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) |
||||||
|
@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ct |
||||||
|
timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) |
||||||
|
{ |
||||||
|
const unsigned char *tzf; |
||||||
|
+ char *memmap = NULL; |
||||||
|
+ size_t maplen; |
||||||
|
timelib_tzinfo *tmp; |
||||||
|
int version; |
||||||
|
int transitions_result, types_result; |
||||||
|
unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */ |
||||||
|
|
||||||
|
- if (seek_to_tz_position(&tzf, timezone, tzdb)) { |
||||||
|
+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { |
||||||
|
tmp = timelib_tzinfo_ctor(timezone); |
||||||
|
|
||||||
|
version = read_preamble(&tzf, tmp, &type); |
||||||
|
@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha |
||||||
|
timelib_tzinfo_dtor(tmp); |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
+ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (memmap) { |
||||||
|
+ const struct location_info *li; |
||||||
|
+ |
||||||
|
+ /* TZif-style - grok the location info from the system database, |
||||||
|
+ * if possible. */ |
||||||
|
+ |
||||||
|
+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { |
||||||
|
+ tmp->location.comments = timelib_strdup(li->comment); |
||||||
|
+ strncpy(tmp->location.country_code, li->code, 2); |
||||||
|
+ tmp->location.longitude = li->longitude; |
||||||
|
+ tmp->location.latitude = li->latitude; |
||||||
|
+ tmp->bc = 1; |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ set_default_location_and_comments(&tzf, tmp); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* Now done with the mmap segment - discard it. */ |
||||||
|
+ munmap(memmap, maplen); |
||||||
|
+ } else { |
||||||
|
+#endif |
||||||
|
if (version == 2 || version == 3) { |
||||||
|
if (!skip_64bit_preamble(&tzf, tmp)) { |
||||||
|
/* 64 bit preamble is not in place */ |
||||||
|
@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha |
||||||
|
} else { |
||||||
|
set_default_location_and_comments(&tzf, tmp); |
||||||
|
} |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ } |
||||||
|
+#endif |
||||||
|
} else { |
||||||
|
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; |
||||||
|
tmp = NULL; |
||||||
|
diff -up php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata php-7.2.3RC1/ext/date/lib/timelib.m4 |
||||||
|
--- php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata 2018-02-13 20:18:34.000000000 +0100 |
||||||
|
+++ php-7.2.3RC1/ext/date/lib/timelib.m4 2018-02-14 06:11:54.273089963 +0100 |
||||||
|
@@ -81,3 +81,16 @@ io.h |
||||||
|
|
||||||
|
dnl Check for strtoll, atoll |
||||||
|
AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday) |
||||||
|
+ |
||||||
|
+PHP_ARG_WITH(system-tzdata, for use of system timezone data, |
||||||
|
+[ --with-system-tzdata[=DIR] to specify use of system timezone data], |
||||||
|
+no, no) |
||||||
|
+ |
||||||
|
+if test "$PHP_SYSTEM_TZDATA" != "no"; then |
||||||
|
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) |
||||||
|
+ |
||||||
|
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then |
||||||
|
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", |
||||||
|
+ [Define for location of system timezone data]) |
||||||
|
+ fi |
||||||
|
+fi |
@ -0,0 +1,30 @@ |
|||||||
|
diff -up php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen php-7.2.4RC1/sapi/litespeed/lsapilib.c |
||||||
|
--- php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen 2018-03-13 12:40:25.330885880 +0100 |
||||||
|
+++ php-7.2.4RC1/sapi/litespeed/lsapilib.c 2018-03-13 12:41:35.797251042 +0100 |
||||||
|
@@ -755,7 +755,7 @@ static int (*fp_lve_leave)(struct liblve |
||||||
|
static int (*fp_lve_jail)( struct passwd *, char *) = NULL; |
||||||
|
static int lsapi_load_lve_lib(void) |
||||||
|
{ |
||||||
|
- s_liblve = dlopen("liblve.so.0", RTLD_LAZY); |
||||||
|
+ s_liblve = dlopen("liblve.so.0", RTLD_NOW); |
||||||
|
if (s_liblve) |
||||||
|
{ |
||||||
|
fp_lve_is_available = dlsym(s_liblve, "lve_is_available"); |
||||||
|
diff -up php-7.2.4RC1/Zend/zend_portability.h.dlopen php-7.2.4RC1/Zend/zend_portability.h |
||||||
|
--- php-7.2.4RC1/Zend/zend_portability.h.dlopen 2018-03-13 12:33:38.000000000 +0100 |
||||||
|
+++ php-7.2.4RC1/Zend/zend_portability.h 2018-03-13 12:40:25.330885880 +0100 |
||||||
|
@@ -144,11 +144,11 @@ |
||||||
|
# endif |
||||||
|
|
||||||
|
# if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT) |
||||||
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) |
||||||
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) |
||||||
|
# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) |
||||||
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND) |
||||||
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND) |
||||||
|
# else |
||||||
|
-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) |
||||||
|
+# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL) |
||||||
|
# endif |
||||||
|
# define DL_UNLOAD dlclose |
||||||
|
# if defined(DLSYM_NEEDS_UNDERSCORE) |
@ -0,0 +1,12 @@ |
|||||||
|
diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac |
||||||
|
--- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100 |
||||||
|
+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100 |
||||||
|
@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` |
||||||
|
fi |
||||||
|
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) |
||||||
|
|
||||||
|
-PHP_UNAME=`uname -a | xargs` |
||||||
|
+PHP_UNAME=`uname | xargs` |
||||||
|
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) |
||||||
|
PHP_OS=`uname | xargs` |
||||||
|
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) |
@ -0,0 +1,279 @@ |
|||||||
|
Adapted for 7.2 from 7.3 by remi |
||||||
|
|
||||||
|
|
||||||
|
From 0ea4013f101d64fbeb9221260b36e98f10ed1ddd Mon Sep 17 00:00:00 2001 |
||||||
|
From: Remi Collet <remi@remirepo.net> |
||||||
|
Date: Wed, 4 Jul 2018 08:48:38 +0200 |
||||||
|
Subject: [PATCH] Fixed bug #62596 add getallheaders (apache_request_headers) |
||||||
|
missing function in FPM add sapi_add_request_header in public API (was |
||||||
|
add_request_header) fix arginfo for fastcgi_finish_request fucntion |
||||||
|
|
||||||
|
--- |
||||||
|
main/SAPI.c | 50 +++++++++++++++++++++++++++++ |
||||||
|
main/SAPI.h | 1 + |
||||||
|
sapi/cgi/cgi_main.c | 51 +---------------------------- |
||||||
|
sapi/fpm/fpm/fpm_main.c | 25 ++++++++++++++- |
||||||
|
sapi/fpm/tests/getallheaders.phpt | 67 +++++++++++++++++++++++++++++++++++++++ |
||||||
|
5 files changed, 143 insertions(+), 51 deletions(-) |
||||||
|
create mode 100644 sapi/fpm/tests/getallheaders.phpt |
||||||
|
|
||||||
|
diff --git a/main/SAPI.c b/main/SAPI.c |
||||||
|
index b6c3329..7e0c7c8 100644 |
||||||
|
--- a/main/SAPI.c |
||||||
|
+++ b/main/SAPI.c |
||||||
|
@@ -1104,6 +1104,56 @@ SAPI_API void sapi_terminate_process(void) { |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
+SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */ |
||||||
|
+{ |
||||||
|
+ zval *return_value = (zval*)arg; |
||||||
|
+ char *str = NULL; |
||||||
|
+ |
||||||
|
+ ALLOCA_FLAG(use_heap) |
||||||
|
+ |
||||||
|
+ if (var_len > 5 && |
||||||
|
+ var[0] == 'H' && |
||||||
|
+ var[1] == 'T' && |
||||||
|
+ var[2] == 'T' && |
||||||
|
+ var[3] == 'P' && |
||||||
|
+ var[4] == '_') { |
||||||
|
+ |
||||||
|
+ char *p; |
||||||
|
+ |
||||||
|
+ var_len -= 5; |
||||||
|
+ p = var + 5; |
||||||
|
+ var = str = do_alloca(var_len + 1, use_heap); |
||||||
|
+ *str++ = *p++; |
||||||
|
+ while (*p) { |
||||||
|
+ if (*p == '_') { |
||||||
|
+ *str++ = '-'; |
||||||
|
+ p++; |
||||||
|
+ if (*p) { |
||||||
|
+ *str++ = *p++; |
||||||
|
+ } |
||||||
|
+ } else if (*p >= 'A' && *p <= 'Z') { |
||||||
|
+ *str++ = (*p++ - 'A' + 'a'); |
||||||
|
+ } else { |
||||||
|
+ *str++ = *p++; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ *str = 0; |
||||||
|
+ } else if (var_len == sizeof("CONTENT_TYPE")-1 && |
||||||
|
+ memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) { |
||||||
|
+ var = "Content-Type"; |
||||||
|
+ } else if (var_len == sizeof("CONTENT_LENGTH")-1 && |
||||||
|
+ memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) { |
||||||
|
+ var = "Content-Length"; |
||||||
|
+ } else { |
||||||
|
+ return; |
||||||
|
+ } |
||||||
|
+ add_assoc_stringl_ex(return_value, var, var_len, val, val_len); |
||||||
|
+ if (str) { |
||||||
|
+ free_alloca(var, use_heap); |
||||||
|
+ } |
||||||
|
+} |
||||||
|
+/* }}} */ |
||||||
|
+ |
||||||
|
/* |
||||||
|
* Local variables: |
||||||
|
* tab-width: 4 |
||||||
|
diff --git a/main/SAPI.h b/main/SAPI.h |
||||||
|
index f829fd7..4b8e223 100644 |
||||||
|
--- a/main/SAPI.h |
||||||
|
+++ b/main/SAPI.h |
||||||
|
@@ -151,6 +151,7 @@ SAPI_API void sapi_shutdown(void); |
||||||
|
SAPI_API void sapi_activate(void); |
||||||
|
SAPI_API void sapi_deactivate(void); |
||||||
|
SAPI_API void sapi_initialize_empty_request(void); |
||||||
|
+SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg); |
||||||
|
END_EXTERN_C() |
||||||
|
|
||||||
|
/* |
||||||
|
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c |
||||||
|
index 2e9cefe..350846d 100644 |
||||||
|
--- a/sapi/cgi/cgi_main.c |
||||||
|
+++ b/sapi/cgi/cgi_main.c |
||||||
|
@@ -1591,54 +1591,6 @@ PHP_FUNCTION(apache_child_terminate) /* |
||||||
|
} |
||||||
|
/* }}} */ |
||||||
|
|
||||||
|
-static void add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */ |
||||||
|
-{ |
||||||
|
- zval *return_value = (zval*)arg; |
||||||
|
- char *str = NULL; |
||||||
|
- char *p; |
||||||
|
- ALLOCA_FLAG(use_heap) |
||||||
|
- |
||||||
|
- if (var_len > 5 && |
||||||
|
- var[0] == 'H' && |
||||||
|
- var[1] == 'T' && |
||||||
|
- var[2] == 'T' && |
||||||
|
- var[3] == 'P' && |
||||||
|
- var[4] == '_') { |
||||||
|
- |
||||||
|
- var_len -= 5; |
||||||
|
- p = var + 5; |
||||||
|
- var = str = do_alloca(var_len + 1, use_heap); |
||||||
|
- *str++ = *p++; |
||||||
|
- while (*p) { |
||||||
|
- if (*p == '_') { |
||||||
|
- *str++ = '-'; |
||||||
|
- p++; |
||||||
|
- if (*p) { |
||||||
|
- *str++ = *p++; |
||||||
|
- } |
||||||
|
- } else if (*p >= 'A' && *p <= 'Z') { |
||||||
|
- *str++ = (*p++ - 'A' + 'a'); |
||||||
|
- } else { |
||||||
|
- *str++ = *p++; |
||||||
|
- } |
||||||
|
- } |
||||||
|
- *str = 0; |
||||||
|
- } else if (var_len == sizeof("CONTENT_TYPE")-1 && |
||||||
|
- memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) { |
||||||
|
- var = "Content-Type"; |
||||||
|
- } else if (var_len == sizeof("CONTENT_LENGTH")-1 && |
||||||
|
- memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) { |
||||||
|
- var = "Content-Length"; |
||||||
|
- } else { |
||||||
|
- return; |
||||||
|
- } |
||||||
|
- add_assoc_stringl_ex(return_value, var, var_len, val, val_len); |
||||||
|
- if (str) { |
||||||
|
- free_alloca(var, use_heap); |
||||||
|
- } |
||||||
|
-} |
||||||
|
-/* }}} */ |
||||||
|
- |
||||||
|
PHP_FUNCTION(apache_request_headers) /* {{{ */ |
||||||
|
{ |
||||||
|
if (zend_parse_parameters_none()) { |
||||||
|
@@ -1648,7 +1600,7 @@ PHP_FUNCTION(apache_request_headers) /* |
||||||
|
if (fcgi_is_fastcgi()) { |
||||||
|
fcgi_request *request = (fcgi_request*) SG(server_context); |
||||||
|
|
||||||
|
- fcgi_loadenv(request, add_request_header, return_value); |
||||||
|
+ fcgi_loadenv(request, sapi_add_request_header, return_value); |
||||||
|
} else { |
||||||
|
char buf[128]; |
||||||
|
char **env, *p, *q, *var, *val, *t = buf; |
||||||
|
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c |
||||||
|
index 3256660..e815be4 100644 |
||||||
|
--- a/sapi/fpm/fpm/fpm_main.c |
||||||
|
+++ b/sapi/fpm/fpm/fpm_main.c |
||||||
|
@@ -1533,6 +1533,10 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ |
||||||
|
{ |
||||||
|
fcgi_request *request = (fcgi_request*) SG(server_context); |
||||||
|
|
||||||
|
+ if (zend_parse_parameters_none() == FAILURE) { |
||||||
|
+ return; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
if (!fcgi_is_closed(request)) { |
||||||
|
php_output_end_all(); |
||||||
|
php_header(); |
||||||
|
@@ -1547,8 +1551,27 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ |
||||||
|
} |
||||||
|
/* }}} */ |
||||||
|
|
||||||
|
+ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0) |
||||||
|
+ZEND_END_ARG_INFO() |
||||||
|
+ |
||||||
|
+PHP_FUNCTION(apache_request_headers) /* {{{ */ |
||||||
|
+{ |
||||||
|
+ fcgi_request *request; |
||||||
|
+ |
||||||
|
+ if (zend_parse_parameters_none() == FAILURE) { |
||||||
|
+ return; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ array_init(return_value); |
||||||
|
+ if ((request = (fcgi_request*) SG(server_context))) { |
||||||
|
+ fcgi_loadenv(request, sapi_add_request_header, return_value); |
||||||
|
+ } |
||||||
|
+} /* }}} */ |
||||||
|
+ |
||||||
|
static const zend_function_entry cgi_fcgi_sapi_functions[] = { |
||||||
|
- PHP_FE(fastcgi_finish_request, NULL) |
||||||
|
+ PHP_FE(fastcgi_finish_request, cgi_fcgi_sapi_no_arginfo) |
||||||
|
+ PHP_FE(apache_request_headers, cgi_fcgi_sapi_no_arginfo) |
||||||
|
+ PHP_FALIAS(getallheaders, apache_request_headers, cgi_fcgi_sapi_no_arginfo) |
||||||
|
PHP_FE_END |
||||||
|
}; |
||||||
|
|
||||||
|
diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt |
||||||
|
new file mode 100644 |
||||||
|
index 0000000..b41f1c6 |
||||||
|
--- /dev/null |
||||||
|
+++ b/sapi/fpm/tests/getallheaders.phpt |
||||||
|
@@ -0,0 +1,67 @@ |
||||||
|
+--TEST-- |
||||||
|
+FPM: Function getallheaders basic test |
||||||
|
+--SKIPIF-- |
||||||
|
+<?php include "skipif.inc"; ?> |
||||||
|
+--FILE-- |
||||||
|
+<?php |
||||||
|
+ |
||||||
|
+require_once "tester.inc"; |
||||||
|
+ |
||||||
|
+$cfg = <<<EOT |
||||||
|
+[global] |
||||||
|
+error_log = {{FILE:LOG}} |
||||||
|
+[unconfined] |
||||||
|
+listen = {{ADDR}} |
||||||
|
+pm = dynamic |
||||||
|
+pm.max_children = 5 |
||||||
|
+pm.start_servers = 1 |
||||||
|
+pm.min_spare_servers = 1 |
||||||
|
+pm.max_spare_servers = 3 |
||||||
|
+EOT; |
||||||
|
+ |
||||||
|
+$code = <<<EOT |
||||||
|
+<?php |
||||||
|
+echo "Test Start\n"; |
||||||
|
+var_dump(getallheaders()); |
||||||
|
+echo "Test End\n"; |
||||||
|
+EOT; |
||||||
|
+ |
||||||
|
+$headers = []; |
||||||
|
+$tester = new FPM\Tester($cfg, $code); |
||||||
|
+$tester->start(); |
||||||
|
+$tester->expectLogStartNotices(); |
||||||
|
+$tester->request( |
||||||
|
+ '', |
||||||
|
+ [ |
||||||
|
+ 'HTTP_X_FOO' => 'BAR', |
||||||
|
+ 'HTTP_FOO' => 'foo' |
||||||
|
+ ] |
||||||
|
+ )->expectBody( |
||||||
|
+ [ |
||||||
|
+ 'Test Start', |
||||||
|
+ 'array(4) {', |
||||||
|
+ ' ["Foo"]=>', |
||||||
|
+ ' string(3) "foo"', |
||||||
|
+ ' ["X-Foo"]=>', |
||||||
|
+ ' string(3) "BAR"', |
||||||
|
+ ' ["Content-Length"]=>', |
||||||
|
+ ' string(1) "0"', |
||||||
|
+ ' ["Content-Type"]=>', |
||||||
|
+ ' string(0) ""', |
||||||
|
+ '}', |
||||||
|
+ 'Test End', |
||||||
|
+ ] |
||||||
|
+ ); |
||||||
|
+$tester->terminate(); |
||||||
|
+$tester->expectLogTerminatingNotices(); |
||||||
|
+$tester->close(); |
||||||
|
+ |
||||||
|
+?> |
||||||
|
+Done |
||||||
|
+--EXPECT-- |
||||||
|
+Done |
||||||
|
+--CLEAN-- |
||||||
|
+<?php |
||||||
|
+require_once "tester.inc"; |
||||||
|
+FPM\Tester::clean(); |
||||||
|
+?> |
||||||
|
-- |
||||||
|
2.1.4 |
@ -0,0 +1,70 @@ |
|||||||
|
From d8765852e0400ee2ce8ae9e2177c42731d4539d8 Mon Sep 17 00:00:00 2001 |
||||||
|
From: Stanislav Malyshev <stas@php.net> |
||||||
|
Date: Wed, 28 Nov 2018 15:45:51 -0800 |
||||||
|
Subject: [PATCH] Add DISPLAY_INI_ENTRIES for imap |
||||||
|
|
||||||
|
--- |
||||||
|
ext/imap/php_imap.c | 2 ++ |
||||||
|
1 file changed, 2 insertions(+) |
||||||
|
|
||||||
|
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c |
||||||
|
index f6feebe9f769..a23e84c08521 100644 |
||||||
|
--- a/ext/imap/php_imap.c |
||||||
|
+++ b/ext/imap/php_imap.c |
||||||
|
@@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap) |
||||||
|
php_info_print_table_row(2, "Kerberos Support", "enabled"); |
||||||
|
#endif |
||||||
|
php_info_print_table_end(); |
||||||
|
+ |
||||||
|
+ DISPLAY_INI_ENTRIES(); |
||||||
|
} |
||||||
|
/* }}} */ |
||||||
|
|
||||||
|
From 7edc639b9ff1c3576773d79d016abbeed1f93846 Mon Sep 17 00:00:00 2001 |
||||||
|
From: Stanislav Malyshev <stas@php.net> |
||||||
|
Date: Sun, 11 Nov 2018 10:04:01 -0800 |
||||||
|
Subject: [PATCH] Fix #77020: null pointer dereference in imap_mail |
||||||
|
|
||||||
|
If an empty $message is passed to imap_mail(), we must not set message |
||||||
|
to NULL, since _php_imap_mail() is not supposed to handle NULL pointers |
||||||
|
(opposed to pointers to NUL). |
||||||
|
--- |
||||||
|
NEWS | 1 + |
||||||
|
ext/imap/php_imap.c | 1 - |
||||||
|
ext/imap/tests/bug77020.phpt | 15 +++++++++++++++ |
||||||
|
3 files changed, 16 insertions(+), 1 deletion(-) |
||||||
|
create mode 100644 ext/imap/tests/bug77020.phpt |
||||||
|
|
||||||
|
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c |
||||||
|
index a23e84c08521..b30440f000f3 100644 |
||||||
|
--- a/ext/imap/php_imap.c |
||||||
|
+++ b/ext/imap/php_imap.c |
||||||
|
@@ -4125,7 +4125,6 @@ PHP_FUNCTION(imap_mail) |
||||||
|
if (!ZSTR_LEN(message)) { |
||||||
|
/* this is not really an error, so it is allowed. */ |
||||||
|
php_error_docref(NULL, E_WARNING, "No message string in mail command"); |
||||||
|
- message = NULL; |
||||||
|
} |
||||||
|
|
||||||
|
if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL, |
||||||
|
diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt |
||||||
|
new file mode 100644 |
||||||
|
index 000000000000..8a65232eec6d |
||||||
|
--- /dev/null |
||||||
|
+++ b/ext/imap/tests/bug77020.phpt |
||||||
|
@@ -0,0 +1,15 @@ |
||||||
|
+--TEST-- |
||||||
|
+Bug #77020 (null pointer dereference in imap_mail) |
||||||
|
+--SKIPIF-- |
||||||
|
+<?php |
||||||
|
+if (!extension_loaded('imap')) die('skip imap extension not available'); |
||||||
|
+?> |
||||||
|
+--FILE-- |
||||||
|
+<?php |
||||||
|
+imap_mail('1', 1, NULL); |
||||||
|
+?> |
||||||
|
+===DONE=== |
||||||
|
+--EXPECTF-- |
||||||
|
+Warning: imap_mail(): No message string in mail command in %s on line %d |
||||||
|
+%s |
||||||
|
+===DONE=== |
@ -1,6 +1,7 @@ |
|||||||
|
|
||||||
<IfModule !mod_php5.c> |
<IfModule !mod_php5.c> |
||||||
<IfModule !prefork.c> |
<IfModule !prefork.c> |
||||||
LoadModule php7_module modules/libphp7-zts.so |
# ZTS module is not supported, so FPM is preferred |
||||||
|
# LoadModule php7_module modules/libphp7-zts.so |
||||||
</IfModule> |
</IfModule> |
||||||
</IfModule> |
</IfModule> |
||||||
|
Loading…
Reference in new issue