diff --git a/.php.metadata b/.php.metadata new file mode 100644 index 0000000..75ab41c --- /dev/null +++ b/.php.metadata @@ -0,0 +1 @@ +7e70ba419778a54f5ff9d7de8d6190ca82de3786 SOURCES/php-5.4.16.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/macros.php b/SOURCES/macros.php new file mode 100644 index 0000000..784d601 --- /dev/null +++ b/SOURCES/macros.php @@ -0,0 +1,19 @@ +# +# Interface versions exposed by PHP: +# +%php_core_api @PHP_APIVER@ +%php_zend_api @PHP_ZENDVER@ +%php_pdo_api @PHP_PDOVER@ +%php_version @PHP_VERSION@ + +%php_extdir %{_libdir}/php/modules +%php_ztsextdir %{_libdir}/php-zts/modules + +%php_inidir %{_sysconfdir}/php.d +%php_ztsinidir %{_sysconfdir}/php-zts.d + +%php_incldir %{_includedir}/php +%php_ztsincldir %{_includedir}/php-zts/php + +%__php %{_bindir}/php +%__ztsphp %{_bindir}/zts-php diff --git a/SOURCES/php-5.2.0-includedir.patch b/SOURCES/php-5.2.0-includedir.patch new file mode 100644 index 0000000..a1c3afe --- /dev/null +++ b/SOURCES/php-5.2.0-includedir.patch @@ -0,0 +1,11 @@ +--- php-5.2.0/configure.in.includedir ++++ php-5.2.0/configure.in +@@ -1101,7 +1101,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 diff --git a/SOURCES/php-5.2.4-embed.patch b/SOURCES/php-5.2.4-embed.patch new file mode 100644 index 0000000..a9d5416 --- /dev/null +++ b/SOURCES/php-5.2.4-embed.patch @@ -0,0 +1,12 @@ +--- php-5.2.4/sapi/embed/config.m4.embed ++++ php-5.2.4/sapi/embed/config.m4 +@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then + case "$PHP_EMBED" in + yes|shared) + PHP_EMBED_TYPE=shared +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)" ++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" + ;; + static) + PHP_EMBED_TYPE=static diff --git a/SOURCES/php-5.3.0-recode.patch b/SOURCES/php-5.3.0-recode.patch new file mode 100644 index 0000000..86f75a5 --- /dev/null +++ b/SOURCES/php-5.3.0-recode.patch @@ -0,0 +1,17 @@ +diff -up php-5.3.0beta1/ext/recode/config9.m4.recode php-5.3.0beta1/ext/recode/config9.m4 +--- php-5.3.0beta1/ext/recode/config9.m4.recode 2008-12-02 00:30:21.000000000 +0100 ++++ php-5.3.0beta1/ext/recode/config9.m4 2009-02-28 09:46:50.000000000 +0100 +@@ -4,13 +4,6 @@ dnl + + dnl Check for extensions with which Recode can not work + if test "$PHP_RECODE" != "no"; then +- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" +- +- if test -n "$MYSQL_LIBNAME"; then +- PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [ +- recode_conflict="$recode_conflict mysql" +- ]) +- fi + + if test -n "$recode_conflict"; then + AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) diff --git a/SOURCES/php-5.3.1-systzdata-v10.patch b/SOURCES/php-5.3.1-systzdata-v10.patch new file mode 100644 index 0000000..b262fae --- /dev/null +++ b/SOURCES/php-5.3.1-systzdata-v10.patch @@ -0,0 +1,635 @@ +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +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 + +--- a/ext/date/lib/parse_tz.c ++++ b/ext/date/lib/parse_tz.c +@@ -20,6 +20,16 @@ + + #include "timelib.h" + ++#ifdef HAVE_SYSTEM_TZDATA ++#include ++#include ++#include ++#include ++#include ++ ++#include "php_scandir.h" ++#endif ++ + #include + + #ifdef HAVE_LOCALE_H +@@ -31,7 +41,12 @@ + #else + #include + #endif ++ ++#ifndef HAVE_SYSTEM_TZDATA + #include "timezonedb.h" ++#endif ++ ++#include + + #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) + # if defined(__LITTLE_ENDIAN__) +@@ -51,9 +66,14 @@ + + static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) + { +- /* skip ID */ +- *tzf += 4; +- ++ if (memcmp(tzf, "TZif", 4) == 0) { ++ *tzf += 20; ++ return; ++ } ++ ++ /* skip ID */ ++ *tzf += 4; ++ + /* read BC flag */ + tz->bc = (**tzf == '\1'); + *tzf += 1; +@@ -256,7 +276,405 @@ + } + } + +-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 = round(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 (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, ".tab") == NULL; ++} ++ ++static int sysdbcmp(const void *first, const void *second) ++{ ++ const timelib_tzdb_index_entry *alpha = first, *beta = second; ++ ++ return strcmp(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) ++{ ++ return S_ISREG(st->st_mode) && st->st_size > 20; ++} ++ ++/* 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; ++ } ++ ++ if (system_location_table) { ++ const struct location_info *li; ++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { ++ /* Use the stored name to avoid case issue */ ++ timezone = li->name; ++ } ++ } ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); ++ ++ fd = open(fname, O_RDONLY); ++ if (fd == -1) { ++ return NULL; ++ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st)) { ++ 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; + #ifdef HAVE_SETLOCALE +@@ -295,36 +713,135 @@ + 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_builtin_identifiers_list(int *count) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ *count = timezonedb_system->index_size; ++ return timezonedb_system->index; ++#else + *count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); + return timezonedb_idx_builtin; ++#endif + } + + 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", timezone); ++ ++ return stat(fname, &st) == 0 && is_valid_tzfile(&st); ++ } ++#endif ++ ++ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); + } + + timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; ++ char *memmap = NULL; ++ size_t maplen; + timelib_tzinfo *tmp; + +- if (seek_to_tz_position(&tzf, timezone, tzdb)) { ++ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { + tmp = timelib_tzinfo_ctor(timezone); + + read_preamble(&tzf, tmp); + read_header(&tzf, tmp); + read_transistions(&tzf, tmp); + read_types(&tzf, tmp); +- read_location(&tzf, tmp); ++ ++#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 = 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 { ++ strcpy(tmp->location.country_code, "??"); ++ tmp->bc = 0; ++ tmp->location.comments = strdup(""); ++ } ++ ++ /* Now done with the mmap segment - discard it. */ ++ munmap(memmap, maplen); ++ } else ++#endif ++ { ++ /* PHP-style - use the embedded info. */ ++ read_location(&tzf, tmp); ++ } + } else { + tmp = NULL; + } +--- a/ext/date/lib/timelib.m4 ++++ b/ext/date/lib/timelib.m4 +@@ -78,3 +78,17 @@ stdlib.h + + dnl Check for strtoll, atoll + AC_CHECK_FUNCS(strtoll atoll strftime) ++ ++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 ++ diff --git a/SOURCES/php-5.4.0-dlopen.patch b/SOURCES/php-5.4.0-dlopen.patch new file mode 100644 index 0000000..c2b0e40 --- /dev/null +++ b/SOURCES/php-5.4.0-dlopen.patch @@ -0,0 +1,17 @@ +--- php-5.4.0RC5/Zend/zend.h.dlopen 2012-01-18 17:10:33.972013835 +0100 ++++ php-5.4.0RC5/Zend/zend.h 2012-01-18 17:12:39.175019492 +0100 +@@ -90,11 +90,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) +-# 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) diff --git a/SOURCES/php-5.4.0-easter.patch b/SOURCES/php-5.4.0-easter.patch new file mode 100644 index 0000000..6ca8f92 --- /dev/null +++ b/SOURCES/php-5.4.0-easter.patch @@ -0,0 +1,689 @@ +diff -up php-5.4.0RC5/ext/standard/basic_functions.c.easter php-5.4.0RC5/ext/standard/basic_functions.c +--- php-5.4.0RC5/ext/standard/basic_functions.c.easter 2012-01-18 17:17:54.016033939 +0100 ++++ php-5.4.0RC5/ext/standard/basic_functions.c 2012-01-18 17:18:54.022036314 +0100 +@@ -1554,9 +1554,6 @@ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0) +-ZEND_END_ARG_INFO() +- + ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0) + ZEND_END_ARG_INFO() + +@@ -2719,7 +2716,6 @@ const zend_function_entry basic_function + PHP_FE(phpcredits, arginfo_phpcredits) + PHP_FE(php_logo_guid, arginfo_php_logo_guid) + PHP_FE(php_real_logo_guid, arginfo_php_real_logo_guid) +- PHP_FE(php_egg_logo_guid, arginfo_php_egg_logo_guid) + PHP_FE(zend_logo_guid, arginfo_zend_logo_guid) + PHP_FE(php_sapi_name, arginfo_php_sapi_name) + PHP_FE(php_uname, arginfo_php_uname) +diff -up php-5.4.0RC5/ext/standard/info.c.easter php-5.4.0RC5/ext/standard/info.c +--- php-5.4.0RC5/ext/standard/info.c.easter 2012-01-18 17:17:44.712033203 +0100 ++++ php-5.4.0RC5/ext/standard/info.c 2012-01-18 17:19:58.097039189 +0100 +@@ -1195,21 +1195,7 @@ PHP_FUNCTION(phpcredits) + */ + PHPAPI char *php_logo_guid(void) + { +- char *logo_guid; +- +- time_t the_time; +- struct tm *ta, tmbuf; +- +- the_time = time(NULL); +- ta = php_localtime_r(&the_time, &tmbuf); +- +- if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) { +- logo_guid = PHP_EGG_LOGO_GUID; +- } else { +- logo_guid = PHP_LOGO_GUID; +- } +- +- return estrdup(logo_guid); ++ return estrdup(PHP_LOGO_GUID); + + } + /* }}} */ +@@ -1238,18 +1224,6 @@ PHP_FUNCTION(php_real_logo_guid) + } + /* }}} */ + +-/* {{{ proto string php_egg_logo_guid(void) +- Return the special ID used to request the PHP logo in phpinfo screens*/ +-PHP_FUNCTION(php_egg_logo_guid) +-{ +- if (zend_parse_parameters_none() == FAILURE) { +- return; +- } +- +- RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1); +-} +-/* }}} */ +- + /* {{{ proto string zend_logo_guid(void) + Return the special ID used to request the Zend logo in phpinfo screens*/ + PHP_FUNCTION(zend_logo_guid) +diff -up php-5.4.0RC5/ext/standard/info.h.easter php-5.4.0RC5/ext/standard/info.h +--- php-5.4.0RC5/ext/standard/info.h.easter 2012-01-18 17:17:37.245032832 +0100 ++++ php-5.4.0RC5/ext/standard/info.h 2012-01-18 17:20:17.160040044 +0100 +@@ -51,7 +51,6 @@ + #endif /* HAVE_CREDITS_DEFS */ + + #define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42" +-#define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42" + #define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42" + #define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000" + +@@ -62,7 +61,6 @@ PHP_FUNCTION(phpcredits); + PHP_FUNCTION(php_logo_guid); + PHP_FUNCTION(php_real_logo_guid); + PHP_FUNCTION(zend_logo_guid); +-PHP_FUNCTION(php_egg_logo_guid); + PHP_FUNCTION(php_sapi_name); + PHP_FUNCTION(php_uname); + PHP_FUNCTION(php_ini_scanned_files); +diff -up php-5.4.0RC5/main/logos.h.easter php-5.4.0RC5/main/logos.h +--- php-5.4.0RC5/main/logos.h.easter 2012-01-18 17:17:27.975032470 +0100 ++++ php-5.4.0RC5/main/logos.h 2012-01-18 17:21:27.036043180 +0100 +@@ -492,589 +492,3 @@ static const unsigned char php_logo[] = + 21, 116, 187, 251, 221, 240, 142, 119, 188, 3, + 1, 0, 59, 0 }; + +-static const unsigned char php_egg_logo[] = { +- 71, 73, 70, 56, 57, 97, 120, 0, 67, 0, +- 231, 255, 0, 18, 25, 33, 32, 30, 34, 28, +- 33, 44, 15, 35, 71, 6, 37, 85, 37, 40, +- 47, 34, 41, 53, 41, 40, 43, 9, 47, 109, +- 30, 45, 68, 21, 48, 84, 51, 46, 55, 43, +- 49, 59, 31, 59, 98, 15, 61, 128, 58, 55, +- 69, 50, 57, 74, 0, 66, 144, 56, 58, 60, +- 54, 59, 71, 32, 66, 113, 60, 65, 67, 63, +- 65, 84, 63, 68, 79, 28, 79, 145, 15, 82, +- 162, 75, 72, 98, 68, 78, 86, 74, 77, 88, +- 50, 82, 122, 41, 85, 134, 76, 78, 108, 70, +- 83, 101, 5, 94, 190, 0, 95, 197, 86, 80, +- 101, 28, 92, 159, 80, 84, 96, 83, 83, 115, +- 81, 87, 89, 22, 97, 183, 86, 88, 85, 0, +- 102, 210, 8, 101, 204, 24, 100, 177, 85, 90, +- 127, 35, 101, 169, 42, 100, 159, 88, 92, 103, +- 0, 107, 216, 69, 95, 132, 0, 108, 210, 84, +- 93, 112, 94, 90, 117, 18, 105, 201, 96, 92, +- 105, 89, 96, 98, 94, 93, 135, 94, 94, 126, +- 30, 106, 210, 7, 112, 222, 33, 108, 198, 16, +- 114, 217, 27, 113, 198, 24, 113, 209, 59, 108, +- 159, 96, 100, 138, 0, 120, 229, 44, 112, 180, +- 49, 112, 171, 71, 108, 148, 99, 104, 115, 90, +- 106, 125, 27, 115, 232, 100, 102, 147, 42, 115, +- 192, 86, 110, 137, 9, 123, 239, 106, 108, 105, +- 105, 105, 138, 33, 118, 228, 12, 125, 227, 48, +- 117, 208, 16, 126, 222, 37, 120, 224, 20, 125, +- 235, 35, 123, 213, 50, 121, 190, 43, 123, 206, +- 40, 123, 220, 105, 110, 160, 59, 122, 182, 78, +- 119, 158, 44, 122, 233, 3, 134, 250, 112, 112, +- 151, 73, 123, 175, 113, 118, 114, 51, 128, 205, +- 34, 129, 246, 11, 136, 245, 34, 130, 240, 113, +- 117, 149, 111, 116, 166, 111, 119, 141, 48, 130, +- 221, 38, 132, 235, 53, 130, 215, 97, 124, 146, +- 116, 122, 124, 117, 121, 131, 54, 130, 229, 41, +- 135, 232, 68, 130, 223, 46, 135, 246, 65, 134, +- 202, 42, 137, 241, 75, 131, 205, 124, 121, 161, +- 101, 125, 191, 86, 128, 210, 121, 122, 169, 105, +- 128, 157, 121, 122, 180, 114, 124, 181, 94, 128, +- 201, 81, 134, 185, 46, 138, 252, 76, 135, 195, +- 34, 142, 252, 62, 137, 229, 63, 138, 217, 33, +- 144, 247, 58, 139, 223, 56, 141, 246, 54, 143, +- 234, 57, 143, 241, 102, 135, 193, 129, 130, 176, +- 122, 136, 144, 46, 148, 252, 45, 149, 246, 118, +- 133, 191, 65, 146, 231, 73, 146, 216, 129, 133, +- 185, 135, 135, 156, 69, 148, 226, 44, 153, 255, +- 94, 143, 216, 132, 136, 175, 88, 146, 207, 137, +- 139, 136, 93, 146, 197, 95, 147, 188, 137, 139, +- 150, 104, 146, 178, 122, 143, 172, 135, 139, 191, +- 57, 156, 254, 67, 154, 245, 70, 154, 239, 134, +- 141, 180, 117, 145, 201, 120, 146, 190, 79, 154, +- 233, 140, 141, 188, 129, 144, 194, 142, 142, 176, +- 137, 147, 156, 88, 155, 222, 82, 157, 230, 93, +- 157, 218, 66, 162, 253, 100, 157, 210, 77, 161, +- 247, 55, 168, 255, 81, 162, 241, 148, 148, 195, +- 145, 149, 202, 127, 156, 204, 77, 166, 255, 142, +- 155, 177, 141, 153, 200, 123, 160, 193, 73, 171, +- 255, 93, 167, 240, 96, 167, 234, 152, 158, 160, +- 101, 167, 228, 119, 164, 206, 155, 158, 171, 110, +- 167, 219, 156, 155, 203, 89, 172, 252, 128, 164, +- 219, 151, 163, 174, 81, 178, 255, 158, 162, 202, +- 102, 175, 249, 93, 178, 251, 108, 175, 237, 103, +- 177, 244, 166, 168, 165, 97, 182, 255, 87, 185, +- 255, 149, 174, 216, 125, 181, 235, 110, 185, 252, +- 117, 183, 254, 171, 172, 209, 166, 175, 197, 103, +- 190, 255, 174, 176, 189, 140, 183, 221, 128, 184, +- 248, 120, 187, 249, 179, 180, 184, 115, 193, 253, +- 170, 183, 193, 174, 181, 215, 107, 197, 255, 135, +- 191, 246, 151, 192, 219, 187, 183, 213, 128, 197, +- 253, 121, 202, 255, 147, 198, 239, 188, 191, 219, +- 148, 200, 252, 192, 193, 197, 134, 205, 254, 171, +- 199, 236, 183, 199, 218, 163, 207, 251, 142, 213, +- 255, 158, 211, 253, 195, 205, 217, 166, 211, 245, +- 205, 204, 228, 153, 218, 255, 190, 210, 236, 186, +- 212, 231, 177, 213, 248, 162, 224, 255, 188, 221, +- 250, 214, 219, 221, 214, 219, 233, 174, 229, 254, +- 198, 225, 247, 209, 226, 248, 186, 233, 251, 227, +- 230, 239, 225, 241, 252, 253, 255, 252, 255, 255, +- 255, 33, 249, 4, 1, 10, 0, 255, 0, 44, +- 0, 0, 0, 0, 120, 0, 67, 0, 0, 8, +- 254, 0, 255, 9, 28, 72, 176, 160, 193, 131, +- 8, 19, 42, 92, 200, 176, 161, 195, 135, 16, +- 35, 74, 156, 72, 177, 162, 197, 139, 22, 131, +- 105, 12, 134, 177, 163, 199, 143, 193, 164, 73, +- 227, 38, 141, 28, 56, 112, 228, 76, 146, 20, +- 41, 205, 152, 75, 99, 183, 100, 201, 50, 101, +- 202, 147, 77, 79, 166, 102, 205, 250, 200, 19, +- 100, 73, 114, 239, 238, 221, 123, 71, 148, 104, +- 202, 163, 224, 86, 138, 124, 25, 115, 166, 205, +- 72, 145, 246, 72, 221, 195, 39, 207, 30, 69, +- 158, 118, 246, 220, 202, 208, 24, 184, 160, 252, +- 248, 9, 29, 59, 212, 100, 75, 99, 53, 159, +- 66, 93, 203, 182, 109, 84, 169, 124, 248, 156, +- 57, 163, 165, 174, 150, 60, 138, 76, 113, 221, +- 251, 207, 24, 183, 119, 97, 3, 135, 125, 71, +- 78, 90, 76, 62, 142, 70, 141, 18, 53, 109, +- 170, 227, 199, 144, 35, 75, 157, 91, 87, 137, +- 229, 28, 74, 190, 228, 229, 139, 209, 43, 96, +- 193, 247, 10, 203, 114, 212, 167, 82, 47, 93, +- 197, 138, 81, 163, 166, 173, 19, 47, 201, 176, +- 99, 59, 166, 171, 36, 135, 237, 22, 45, 114, +- 216, 209, 203, 25, 98, 176, 191, 66, 195, 134, +- 54, 230, 233, 150, 179, 100, 197, 106, 181, 90, +- 158, 171, 57, 179, 110, 231, 124, 185, 145, 77, +- 157, 186, 150, 218, 45, 76, 104, 111, 145, 71, +- 86, 239, 133, 198, 200, 254, 145, 189, 199, 205, +- 212, 212, 115, 244, 232, 157, 107, 86, 172, 185, +- 234, 92, 197, 154, 137, 11, 231, 11, 77, 245, +- 251, 178, 207, 40, 201, 254, 225, 131, 134, 39, +- 138, 124, 103, 80, 73, 68, 13, 37, 141, 39, +- 144, 213, 115, 14, 60, 235, 116, 211, 12, 123, +- 197, 136, 67, 141, 106, 226, 156, 51, 78, 16, +- 92, 208, 194, 7, 126, 28, 70, 166, 159, 9, +- 26, 132, 104, 130, 29, 2, 254, 67, 32, 81, +- 224, 200, 18, 91, 56, 240, 208, 35, 78, 51, +- 238, 49, 40, 223, 58, 240, 88, 99, 132, 31, +- 207, 168, 131, 14, 55, 206, 56, 115, 203, 41, +- 167, 172, 229, 73, 36, 158, 196, 133, 216, 83, +- 29, 58, 166, 69, 11, 26, 88, 96, 129, 6, +- 95, 112, 230, 213, 81, 210, 188, 21, 27, 59, +- 208, 208, 179, 14, 123, 205, 81, 227, 96, 55, +- 235, 208, 227, 14, 23, 126, 244, 162, 204, 49, +- 200, 64, 3, 13, 51, 194, 232, 162, 139, 50, +- 105, 106, 131, 13, 54, 225, 132, 227, 205, 157, +- 207, 96, 243, 204, 48, 195, 244, 72, 28, 126, +- 103, 48, 233, 164, 6, 36, 246, 20, 210, 81, +- 198, 224, 87, 143, 48, 12, 78, 8, 75, 43, +- 242, 21, 3, 38, 60, 227, 116, 224, 2, 22, +- 135, 32, 162, 41, 33, 112, 208, 129, 72, 35, +- 135, 8, 242, 72, 40, 163, 150, 82, 202, 42, +- 186, 172, 178, 203, 46, 169, 170, 154, 76, 50, +- 254, 123, 158, 194, 97, 14, 22, 60, 240, 192, +- 7, 188, 117, 228, 23, 74, 198, 88, 41, 219, +- 56, 189, 36, 19, 203, 57, 235, 80, 147, 11, +- 44, 176, 20, 211, 96, 51, 240, 192, 195, 14, +- 5, 36, 88, 129, 8, 33, 116, 200, 81, 198, +- 181, 101, 208, 1, 199, 27, 220, 110, 59, 69, +- 22, 130, 20, 82, 200, 35, 165, 76, 34, 110, +- 33, 147, 64, 162, 174, 42, 192, 200, 122, 223, +- 25, 38, 216, 186, 192, 19, 24, 133, 52, 82, +- 149, 247, 161, 179, 203, 35, 136, 8, 243, 72, +- 57, 244, 80, 179, 220, 39, 185, 192, 163, 77, +- 55, 244, 236, 227, 14, 5, 17, 0, 65, 7, +- 25, 101, 120, 81, 197, 196, 216, 82, 97, 49, +- 21, 81, 68, 145, 69, 22, 105, 116, 236, 113, +- 26, 161, 148, 59, 136, 24, 98, 64, 210, 203, +- 40, 28, 106, 161, 193, 2, 11, 88, 144, 171, +- 68, 246, 74, 163, 226, 125, 207, 156, 105, 8, +- 25, 212, 54, 218, 202, 39, 4, 227, 115, 142, +- 54, 233, 177, 211, 65, 4, 51, 84, 113, 109, +- 21, 77, 52, 1, 69, 23, 19, 15, 1, 197, +- 16, 84, 12, 17, 197, 182, 112, 8, 146, 198, +- 20, 86, 147, 139, 204, 49, 169, 78, 50, 200, +- 32, 144, 56, 210, 97, 14, 15, 176, 28, 37, +- 204, 198, 180, 228, 107, 108, 158, 60, 19, 202, +- 43, 159, 200, 225, 133, 28, 175, 224, 3, 15, +- 50, 176, 80, 2, 75, 254, 51, 94, 34, 140, +- 143, 208, 68, 119, 129, 45, 210, 93, 48, 13, +- 197, 210, 60, 240, 0, 133, 15, 111, 104, 138, +- 8, 28, 27, 79, 1, 199, 35, 163, 234, 18, +- 139, 155, 233, 206, 177, 97, 202, 22, 28, 112, +- 128, 14, 17, 5, 227, 210, 204, 213, 69, 178, +- 11, 40, 160, 16, 194, 8, 33, 134, 52, 17, +- 142, 122, 197, 236, 156, 11, 51, 185, 52, 3, +- 244, 62, 128, 207, 16, 49, 182, 93, 36, 125, +- 120, 23, 135, 67, 193, 131, 15, 112, 148, 147, +- 143, 58, 216, 8, 3, 249, 198, 89, 192, 1, +- 199, 33, 143, 196, 18, 203, 42, 144, 104, 222, +- 33, 31, 26, 120, 62, 194, 67, 162, 255, 121, +- 159, 35, 149, 104, 58, 135, 21, 100, 64, 92, +- 69, 139, 198, 238, 156, 236, 222, 226, 208, 131, +- 207, 56, 13, 56, 80, 116, 19, 215, 54, 81, +- 197, 24, 73, 23, 126, 248, 16, 62, 248, 144, +- 133, 62, 110, 112, 194, 50, 202, 113, 8, 231, +- 101, 193, 7, 64, 152, 220, 184, 30, 129, 42, +- 93, 168, 66, 108, 29, 50, 129, 231, 52, 208, +- 16, 89, 220, 162, 87, 248, 137, 68, 29, 178, +- 160, 6, 53, 188, 225, 5, 85, 176, 86, 21, +- 232, 1, 15, 113, 228, 98, 57, 173, 104, 143, +- 151, 224, 241, 190, 248, 249, 160, 126, 114, 136, +- 161, 181, 202, 16, 53, 167, 13, 97, 120, 105, +- 184, 7, 7, 12, 224, 4, 111, 192, 65, 114, +- 254, 144, 3, 66, 26, 14, 145, 6, 43, 88, +- 1, 11, 107, 128, 196, 42, 86, 1, 65, 14, +- 181, 224, 0, 1, 160, 160, 66, 100, 114, 139, +- 181, 197, 230, 22, 117, 152, 194, 20, 162, 160, +- 134, 42, 144, 64, 10, 248, 163, 67, 122, 214, +- 17, 187, 79, 232, 45, 23, 226, 16, 7, 62, +- 240, 97, 13, 5, 16, 109, 12, 215, 98, 4, +- 207, 64, 193, 51, 77, 53, 66, 83, 84, 240, +- 65, 26, 218, 113, 1, 3, 180, 1, 27, 144, +- 19, 196, 183, 128, 128, 196, 66, 132, 98, 13, +- 63, 72, 228, 15, 176, 32, 134, 68, 52, 241, +- 62, 45, 8, 64, 0, 106, 144, 144, 89, 152, +- 66, 22, 8, 186, 207, 40, 214, 32, 8, 107, +- 216, 194, 5, 67, 144, 218, 15, 134, 208, 5, +- 68, 184, 15, 30, 205, 120, 148, 25, 97, 1, +- 157, 125, 208, 227, 25, 3, 136, 64, 12, 232, +- 215, 136, 121, 200, 35, 31, 249, 168, 71, 61, +- 242, 33, 143, 118, 108, 67, 30, 208, 128, 195, +- 32, 218, 49, 1, 1, 180, 1, 121, 199, 120, +- 197, 35, 136, 184, 134, 102, 146, 11, 137, 88, +- 80, 228, 37, 104, 145, 36, 13, 72, 178, 80, +- 5, 153, 5, 78, 50, 73, 157, 72, 92, 98, +- 13, 135, 208, 135, 63, 252, 129, 132, 40, 116, +- 193, 105, 192, 11, 5, 62, 92, 217, 140, 157, +- 49, 162, 21, 104, 60, 199, 62, 224, 225, 10, +- 2, 68, 128, 10, 114, 254, 32, 196, 49, 178, +- 113, 129, 11, 112, 224, 159, 37, 224, 192, 6, +- 46, 176, 129, 108, 148, 99, 21, 213, 40, 230, +- 1, 78, 128, 3, 55, 240, 34, 29, 216, 8, +- 197, 36, 122, 81, 10, 114, 61, 2, 93, 107, +- 136, 230, 28, 230, 96, 13, 43, 202, 230, 1, +- 1, 56, 128, 119, 10, 146, 150, 251, 240, 65, +- 21, 88, 200, 194, 60, 198, 233, 143, 84, 164, +- 193, 104, 72, 43, 195, 49, 214, 8, 143, 216, +- 49, 226, 157, 197, 208, 70, 251, 216, 193, 5, +- 2, 100, 160, 10, 129, 64, 4, 54, 54, 81, +- 2, 24, 148, 128, 6, 48, 160, 193, 81, 3, +- 202, 0, 115, 120, 99, 19, 19, 40, 128, 1, +- 74, 208, 79, 6, 20, 32, 12, 222, 8, 133, +- 45, 136, 241, 141, 103, 232, 194, 84, 143, 72, +- 195, 15, 196, 112, 9, 87, 248, 226, 22, 28, +- 58, 3, 20, 183, 71, 144, 89, 16, 201, 163, +- 145, 185, 68, 74, 7, 145, 130, 106, 140, 83, +- 15, 136, 40, 131, 181, 154, 48, 6, 111, 140, +- 145, 61, 173, 72, 214, 131, 210, 83, 41, 2, +- 160, 128, 12, 140, 104, 68, 57, 220, 80, 212, +- 106, 224, 50, 151, 250, 248, 69, 9, 24, 208, +- 6, 126, 28, 225, 2, 1, 32, 70, 53, 126, +- 193, 88, 1, 0, 96, 17, 165, 96, 2, 65, +- 113, 16, 6, 76, 96, 98, 27, 202, 16, 43, +- 89, 51, 193, 10, 82, 108, 174, 58, 38, 144, +- 254, 228, 203, 134, 4, 87, 200, 220, 1, 11, +- 64, 160, 66, 16, 12, 80, 128, 118, 216, 195, +- 5, 141, 40, 31, 182, 216, 145, 30, 23, 181, +- 135, 149, 212, 8, 19, 60, 188, 145, 0, 4, +- 100, 225, 19, 59, 155, 7, 13, 78, 80, 130, +- 109, 60, 67, 24, 141, 128, 67, 33, 204, 81, +- 130, 2, 84, 224, 30, 37, 152, 128, 4, 242, +- 113, 167, 121, 216, 162, 152, 39, 120, 6, 8, +- 4, 192, 128, 13, 112, 160, 159, 6, 192, 68, +- 41, 122, 240, 131, 65, 0, 2, 16, 115, 48, +- 171, 51, 238, 3, 69, 41, 254, 195, 173, 181, +- 125, 12, 31, 122, 0, 132, 25, 248, 192, 3, +- 211, 56, 0, 13, 54, 145, 5, 50, 236, 149, +- 126, 236, 104, 17, 60, 186, 113, 44, 73, 73, +- 120, 29, 174, 136, 37, 28, 102, 215, 10, 121, +- 208, 192, 13, 71, 72, 135, 50, 38, 22, 133, +- 66, 164, 163, 187, 12, 216, 6, 7, 24, 112, +- 132, 114, 192, 33, 13, 144, 248, 69, 1, 0, +- 112, 2, 98, 126, 54, 30, 211, 32, 6, 26, +- 120, 11, 12, 32, 244, 64, 12, 115, 240, 195, +- 18, 174, 0, 8, 87, 144, 226, 20, 164, 147, +- 76, 36, 3, 48, 82, 243, 4, 120, 42, 3, +- 182, 193, 10, 86, 48, 3, 18, 20, 32, 0, +- 2, 32, 129, 26, 200, 80, 133, 194, 53, 129, +- 12, 236, 160, 17, 60, 210, 7, 11, 113, 172, +- 227, 204, 225, 144, 129, 254, 97, 65, 33, 12, +- 129, 165, 131, 3, 55, 112, 131, 45, 142, 81, +- 5, 42, 188, 225, 17, 237, 88, 241, 2, 36, +- 107, 128, 69, 196, 66, 13, 130, 120, 6, 26, +- 60, 187, 136, 106, 120, 22, 23, 186, 224, 90, +- 60, 12, 0, 0, 78, 76, 161, 7, 88, 152, +- 67, 16, 92, 176, 4, 34, 92, 97, 11, 91, +- 200, 132, 53, 204, 35, 153, 51, 72, 146, 94, +- 255, 120, 242, 84, 60, 177, 4, 41, 171, 64, +- 5, 59, 0, 2, 5, 18, 128, 1, 56, 220, +- 236, 90, 189, 83, 3, 59, 206, 97, 230, 102, +- 64, 55, 23, 201, 61, 179, 55, 26, 128, 128, +- 52, 188, 162, 24, 204, 128, 196, 52, 56, 0, +- 131, 77, 88, 67, 24, 132, 64, 196, 33, 212, +- 241, 139, 11, 20, 224, 8, 104, 184, 128, 0, +- 170, 129, 8, 53, 100, 193, 25, 16, 0, 0, +- 0, 182, 49, 104, 6, 36, 67, 153, 143, 184, +- 68, 2, 0, 192, 133, 52, 160, 0, 11, 87, +- 120, 129, 11, 88, 192, 110, 18, 144, 128, 8, +- 153, 118, 70, 162, 34, 99, 129, 40, 10, 196, +- 164, 128, 232, 193, 10, 98, 16, 131, 29, 248, +- 27, 8, 133, 224, 32, 33, 132, 123, 173, 70, +- 172, 35, 141, 235, 64, 6, 116, 97, 65, 172, +- 51, 103, 98, 0, 25, 120, 133, 48, 218, 163, +- 138, 84, 252, 51, 27, 232, 160, 6, 51, 160, +- 193, 142, 108, 28, 97, 2, 12, 176, 7, 18, +- 254, 250, 136, 142, 14, 102, 161, 19, 140, 102, +- 64, 59, 178, 189, 1, 109, 188, 34, 20, 133, +- 240, 131, 103, 57, 113, 136, 31, 44, 97, 14, +- 91, 32, 1, 187, 89, 224, 110, 23, 144, 160, +- 8, 96, 240, 3, 46, 146, 44, 149, 15, 4, +- 96, 1, 247, 174, 206, 41, 176, 96, 131, 29, +- 240, 32, 6, 42, 224, 247, 14, 124, 16, 5, +- 58, 88, 221, 193, 85, 240, 2, 51, 194, 113, +- 142, 110, 72, 40, 23, 202, 233, 70, 179, 202, +- 209, 1, 2, 212, 129, 25, 108, 202, 133, 55, +- 208, 192, 129, 18, 152, 227, 30, 230, 216, 6, +- 49, 156, 64, 108, 8, 164, 226, 30, 48, 152, +- 192, 6, 158, 65, 7, 53, 88, 1, 9, 158, +- 61, 194, 52, 102, 76, 12, 109, 8, 35, 22, +- 144, 232, 196, 161, 225, 32, 134, 43, 92, 161, +- 8, 47, 120, 1, 17, 212, 237, 110, 12, 252, +- 28, 211, 156, 128, 140, 18, 36, 41, 144, 215, +- 194, 198, 19, 115, 0, 194, 10, 84, 192, 131, +- 33, 240, 187, 223, 62, 160, 66, 178, 7, 14, +- 49, 50, 208, 233, 96, 231, 152, 16, 123, 230, +- 83, 142, 12, 59, 32, 22, 26, 103, 70, 43, +- 230, 1, 130, 182, 95, 128, 6, 19, 184, 64, +- 240, 139, 234, 134, 120, 84, 99, 197, 109, 240, +- 134, 26, 232, 80, 7, 11, 104, 123, 27, 72, +- 0, 192, 6, 228, 49, 14, 61, 165, 131, 6, +- 0, 144, 0, 43, 4, 254, 49, 136, 43, 16, +- 33, 8, 30, 136, 60, 188, 225, 237, 238, 23, +- 20, 97, 11, 153, 127, 204, 230, 3, 240, 223, +- 234, 140, 2, 11, 83, 142, 58, 15, 202, 80, +- 133, 167, 199, 96, 8, 141, 128, 155, 33, 62, +- 65, 6, 67, 112, 29, 26, 21, 114, 14, 204, +- 144, 83, 212, 112, 14, 222, 80, 118, 98, 128, +- 12, 180, 35, 12, 185, 32, 15, 16, 0, 103, +- 71, 0, 98, 71, 0, 3, 48, 224, 6, 219, +- 48, 15, 143, 32, 9, 28, 48, 1, 188, 80, +- 14, 84, 160, 6, 137, 192, 104, 23, 144, 14, +- 217, 38, 1, 188, 112, 130, 188, 0, 3, 152, +- 149, 10, 230, 50, 8, 150, 22, 4, 50, 0, +- 6, 91, 64, 4, 46, 224, 2, 145, 7, 126, +- 65, 16, 4, 91, 128, 11, 234, 199, 121, 255, +- 16, 23, 178, 81, 7, 82, 32, 2, 168, 22, +- 3, 62, 48, 4, 100, 160, 6, 79, 23, 5, +- 135, 240, 10, 173, 48, 45, 251, 7, 13, 231, +- 160, 38, 102, 118, 14, 117, 82, 39, 126, 0, +- 113, 186, 128, 12, 12, 88, 11, 185, 176, 13, +- 19, 112, 3, 37, 192, 15, 185, 84, 15, 243, +- 16, 15, 234, 112, 12, 136, 80, 10, 237, 64, +- 12, 196, 112, 15, 215, 64, 5, 112, 128, 11, +- 22, 208, 103, 182, 32, 1, 0, 192, 0, 239, +- 5, 80, 23, 208, 6, 207, 80, 8, 96, 3, +- 111, 70, 128, 6, 118, 192, 4, 96, 0, 121, +- 254, 36, 240, 2, 96, 176, 33, 150, 192, 5, +- 92, 224, 43, 235, 39, 16, 103, 224, 121, 144, +- 49, 10, 63, 48, 3, 163, 23, 3, 195, 243, +- 129, 101, 160, 6, 169, 247, 10, 200, 0, 10, +- 204, 209, 10, 194, 16, 14, 201, 195, 34, 7, +- 151, 12, 225, 0, 12, 10, 224, 0, 147, 160, +- 13, 180, 227, 133, 208, 240, 11, 196, 230, 6, +- 253, 112, 12, 159, 208, 119, 86, 103, 8, 214, +- 246, 10, 209, 80, 14, 209, 0, 10, 67, 0, +- 7, 227, 16, 15, 247, 192, 15, 72, 192, 91, +- 246, 176, 13, 169, 176, 8, 110, 144, 10, 214, +- 5, 61, 35, 227, 2, 91, 32, 3, 86, 33, +- 21, 92, 0, 6, 47, 224, 1, 50, 32, 10, +- 176, 17, 137, 63, 72, 137, 142, 113, 10, 98, +- 208, 116, 81, 199, 111, 60, 64, 5, 143, 83, +- 6, 67, 160, 6, 177, 16, 14, 208, 160, 13, +- 106, 194, 12, 200, 160, 12, 218, 112, 12, 82, +- 152, 12, 187, 160, 10, 151, 64, 1, 8, 240, +- 3, 10, 184, 51, 148, 208, 10, 139, 85, 2, +- 37, 176, 9, 253, 32, 12, 134, 80, 6, 251, +- 83, 62, 84, 144, 45, 141, 64, 8, 84, 192, +- 3, 158, 8, 4, 86, 64, 10, 28, 32, 0, +- 56, 224, 13, 194, 176, 11, 222, 80, 14, 202, +- 16, 10, 135, 32, 46, 141, 7, 111, 45, 224, +- 24, 145, 144, 9, 91, 0, 6, 70, 0, 6, +- 112, 101, 116, 72, 247, 254, 15, 123, 112, 6, +- 176, 65, 11, 63, 176, 111, 59, 208, 111, 154, +- 216, 142, 135, 0, 10, 136, 16, 10, 194, 160, +- 13, 201, 160, 13, 117, 34, 14, 208, 128, 12, +- 186, 208, 11, 187, 112, 9, 128, 224, 1, 20, +- 64, 0, 8, 96, 3, 203, 1, 11, 159, 112, +- 83, 175, 80, 15, 52, 208, 118, 196, 144, 15, +- 185, 32, 66, 67, 80, 5, 100, 64, 7, 81, +- 83, 56, 85, 48, 3, 20, 233, 3, 54, 208, +- 3, 157, 192, 0, 0, 64, 12, 208, 0, 10, +- 63, 4, 7, 202, 54, 146, 133, 48, 7, 151, +- 64, 4, 96, 112, 146, 144, 225, 7, 96, 192, +- 5, 226, 40, 21, 245, 38, 69, 158, 48, 23, +- 145, 97, 10, 115, 96, 3, 34, 48, 122, 231, +- 88, 122, 112, 160, 6, 165, 16, 11, 161, 112, +- 12, 202, 112, 9, 151, 16, 14, 226, 32, 143, +- 244, 40, 6, 24, 224, 0, 8, 128, 0, 17, +- 128, 2, 135, 128, 66, 173, 64, 9, 140, 64, +- 9, 185, 208, 15, 196, 144, 10, 191, 192, 15, +- 236, 0, 10, 114, 96, 56, 93, 32, 7, 73, +- 120, 67, 80, 64, 5, 59, 128, 132, 84, 0, +- 4, 107, 48, 104, 5, 240, 13, 194, 0, 10, +- 111, 0, 4, 64, 32, 57, 105, 128, 46, 171, +- 48, 7, 223, 39, 4, 145, 1, 132, 157, 246, +- 105, 2, 49, 11, 115, 33, 142, 167, 240, 3, +- 54, 224, 3, 153, 152, 56, 80, 243, 6, 112, +- 254, 0, 138, 177, 32, 12, 208, 160, 10, 106, +- 130, 13, 0, 24, 14, 197, 128, 148, 107, 208, +- 3, 86, 32, 138, 202, 193, 51, 85, 121, 83, +- 173, 112, 14, 229, 192, 14, 234, 80, 14, 173, +- 160, 87, 101, 0, 60, 33, 148, 132, 112, 32, +- 60, 60, 48, 3, 184, 233, 3, 170, 224, 75, +- 237, 128, 13, 79, 72, 5, 84, 246, 45, 83, +- 0, 136, 221, 71, 4, 50, 64, 147, 29, 178, +- 100, 35, 37, 147, 132, 249, 24, 137, 128, 152, +- 43, 224, 111, 57, 121, 132, 92, 4, 7, 161, +- 160, 12, 111, 162, 11, 115, 32, 153, 199, 176, +- 117, 63, 83, 158, 244, 8, 10, 148, 48, 144, +- 237, 25, 8, 44, 26, 8, 114, 16, 8, 169, +- 193, 8, 11, 41, 56, 133, 195, 3, 244, 99, +- 117, 84, 80, 5, 80, 192, 111, 244, 195, 63, +- 64, 16, 10, 186, 32, 12, 5, 234, 3, 49, +- 48, 3, 195, 153, 6, 88, 48, 50, 240, 246, +- 1, 73, 178, 7, 253, 213, 86, 90, 224, 160, +- 142, 33, 6, 33, 48, 101, 254, 118, 67, 169, +- 39, 8, 175, 208, 132, 210, 179, 11, 189, 176, +- 5, 202, 160, 12, 107, 194, 117, 83, 216, 10, +- 180, 83, 149, 44, 234, 5, 99, 224, 5, 127, +- 224, 5, 110, 58, 6, 178, 89, 6, 74, 51, +- 49, 80, 192, 144, 246, 83, 6, 159, 210, 119, +- 166, 55, 75, 12, 57, 3, 213, 201, 132, 160, +- 160, 6, 81, 48, 4, 254, 51, 48, 3, 89, +- 96, 68, 73, 234, 125, 65, 96, 2, 73, 18, +- 91, 1, 240, 50, 255, 160, 8, 81, 234, 24, +- 142, 176, 4, 33, 32, 2, 137, 57, 3, 84, +- 0, 5, 29, 84, 53, 64, 154, 42, 170, 144, +- 9, 92, 112, 9, 165, 16, 143, 196, 98, 133, +- 12, 184, 51, 104, 170, 166, 99, 176, 166, 115, +- 227, 162, 173, 154, 52, 247, 217, 101, 89, 87, +- 6, 132, 208, 8, 62, 89, 5, 67, 144, 147, +- 19, 195, 3, 43, 96, 3, 81, 240, 10, 141, +- 160, 6, 95, 217, 159, 126, 106, 3, 71, 36, +- 6, 68, 80, 4, 50, 144, 36, 106, 21, 0, +- 108, 5, 165, 147, 42, 21, 166, 96, 169, 83, +- 214, 111, 137, 83, 5, 206, 3, 10, 161, 48, +- 61, 170, 224, 7, 32, 0, 1, 50, 0, 9, +- 186, 64, 39, 86, 104, 120, 202, 161, 170, 140, +- 224, 166, 106, 250, 7, 109, 234, 166, 49, 228, +- 5, 134, 224, 5, 73, 67, 63, 114, 80, 5, +- 183, 154, 58, 55, 164, 2, 177, 73, 6, 80, +- 96, 164, 108, 214, 10, 92, 198, 63, 51, 16, +- 2, 6, 75, 95, 138, 42, 165, 248, 1, 82, +- 34, 117, 16, 166, 80, 23, 155, 115, 11, 87, +- 96, 161, 51, 192, 111, 156, 170, 108, 160, 32, +- 61, 171, 192, 10, 32, 16, 124, 48, 208, 9, +- 189, 128, 148, 208, 16, 14, 176, 72, 59, 55, +- 69, 154, 129, 192, 166, 127, 176, 166, 114, 163, +- 254, 166, 94, 0, 49, 77, 192, 3, 73, 208, +- 4, 115, 67, 6, 160, 128, 171, 132, 160, 6, +- 60, 10, 49, 60, 96, 3, 112, 112, 179, 100, +- 16, 8, 236, 8, 4, 54, 96, 176, 33, 128, +- 2, 40, 192, 2, 68, 160, 4, 213, 116, 77, +- 9, 33, 169, 90, 48, 21, 115, 160, 111, 153, +- 184, 3, 114, 136, 58, 135, 208, 173, 171, 224, +- 10, 253, 132, 6, 81, 113, 10, 172, 240, 38, +- 216, 160, 13, 242, 40, 164, 104, 250, 7, 129, +- 224, 174, 129, 192, 8, 114, 208, 166, 134, 128, +- 63, 17, 147, 56, 77, 32, 155, 132, 32, 138, +- 136, 80, 5, 58, 11, 5, 47, 219, 5, 253, +- 9, 7, 46, 74, 8, 236, 232, 3, 244, 133, +- 2, 71, 139, 180, 44, 16, 4, 73, 178, 100, +- 148, 164, 16, 121, 80, 23, 82, 225, 10, 55, +- 153, 137, 70, 168, 6, 136, 32, 8, 47, 86, +- 8, 165, 160, 9, 19, 96, 6, 142, 193, 7, +- 163, 176, 11, 202, 192, 117, 242, 232, 78, 108, +- 235, 174, 238, 58, 6, 104, 203, 170, 73, 227, +- 5, 73, 48, 179, 65, 139, 171, 175, 80, 109, +- 84, 80, 52, 178, 217, 4, 187, 58, 4, 217, +- 82, 5, 83, 99, 5, 61, 128, 180, 190, 203, +- 2, 46, 192, 180, 78, 36, 73, 254, 197, 184, +- 117, 145, 7, 180, 192, 116, 138, 201, 111, 133, +- 74, 117, 89, 112, 8, 186, 160, 9, 23, 16, +- 25, 159, 171, 83, 240, 254, 120, 66, 104, 58, +- 6, 129, 176, 166, 174, 10, 167, 100, 80, 175, +- 245, 138, 51, 160, 144, 11, 112, 153, 71, 47, +- 84, 62, 49, 91, 122, 116, 0, 60, 81, 0, +- 4, 152, 122, 180, 75, 144, 1, 25, 112, 184, +- 17, 68, 188, 15, 209, 184, 90, 80, 173, 54, +- 80, 168, 167, 39, 60, 22, 243, 6, 208, 43, +- 189, 146, 49, 10, 218, 112, 174, 19, 119, 44, +- 60, 67, 186, 45, 234, 162, 114, 80, 175, 93, +- 86, 6, 159, 0, 10, 177, 11, 7, 81, 112, +- 132, 47, 75, 175, 78, 99, 52, 60, 160, 2, +- 86, 90, 168, 54, 176, 4, 46, 144, 1, 87, +- 112, 141, 213, 113, 6, 245, 102, 111, 16, 33, +- 169, 138, 48, 177, 152, 184, 147, 19, 153, 122, +- 28, 154, 12, 156, 48, 189, 146, 241, 12, 87, +- 8, 13, 26, 215, 30, 237, 89, 11, 200, 128, +- 12, 178, 3, 93, 235, 234, 5, 101, 144, 132, +- 208, 149, 41, 21, 252, 144, 220, 27, 60, 117, +- 250, 116, 161, 228, 163, 132, 116, 5, 46, 144, +- 8, 248, 161, 4, 11, 32, 73, 139, 27, 17, +- 166, 240, 5, 144, 208, 3, 251, 187, 111, 165, +- 39, 135, 136, 240, 10, 146, 41, 192, 146, 113, +- 10, 231, 96, 133, 212, 32, 12, 112, 195, 162, +- 104, 27, 8, 173, 0, 55, 183, 214, 10, 55, +- 85, 149, 79, 200, 173, 144, 99, 96, 170, 35, +- 92, 192, 51, 4, 116, 64, 127, 161, 244, 129, +- 254, 83, 80, 156, 147, 16, 100, 222, 8, 91, +- 80, 116, 0, 103, 51, 17, 193, 192, 10, 145, +- 123, 161, 6, 118, 181, 175, 240, 38, 153, 64, +- 195, 53, 76, 178, 218, 128, 12, 185, 80, 149, +- 109, 251, 7, 132, 32, 7, 134, 240, 7, 49, +- 180, 182, 107, 11, 187, 91, 122, 8, 82, 96, +- 3, 89, 128, 8, 173, 208, 8, 154, 92, 6, +- 141, 208, 8, 129, 96, 8, 3, 103, 117, 207, +- 35, 81, 27, 203, 131, 212, 161, 4, 32, 21, +- 0, 18, 0, 169, 18, 49, 14, 107, 128, 137, +- 251, 150, 122, 87, 43, 12, 245, 8, 12, 27, +- 240, 151, 82, 241, 12, 218, 64, 13, 56, 44, +- 12, 181, 192, 8, 105, 123, 83, 210, 44, 55, +- 160, 204, 162, 148, 64, 48, 185, 16, 10, 161, +- 80, 68, 105, 48, 190, 114, 76, 205, 55, 149, +- 79, 172, 71, 45, 112, 208, 8, 163, 178, 10, +- 201, 128, 203, 176, 161, 5, 39, 60, 73, 30, +- 49, 8, 82, 230, 197, 95, 169, 202, 109, 162, +- 12, 192, 64, 3, 150, 0, 27, 201, 35, 12, +- 108, 34, 12, 210, 220, 162, 55, 229, 162, 110, +- 26, 203, 238, 249, 198, 177, 160, 12, 144, 48, +- 8, 177, 112, 12, 194, 0, 148, 205, 1, 55, +- 210, 44, 205, 229, 67, 7, 201, 6, 42, 12, +- 148, 12, 190, 0, 27, 124, 240, 1, 80, 20, +- 0, 46, 243, 17, 170, 96, 5, 133, 122, 155, +- 31, 168, 202, 14, 141, 254, 12, 189, 128, 4, +- 146, 32, 25, 124, 160, 13, 171, 44, 144, 45, +- 106, 8, 134, 240, 162, 11, 188, 182, 208, 149, +- 66, 229, 169, 13, 151, 160, 10, 247, 88, 10, +- 68, 89, 182, 85, 233, 96, 194, 101, 209, 81, +- 160, 108, 151, 211, 11, 192, 240, 24, 168, 192, +- 7, 42, 243, 209, 11, 144, 200, 30, 145, 12, +- 105, 80, 168, 205, 171, 6, 231, 252, 10, 151, +- 179, 11, 156, 112, 4, 252, 188, 198, 100, 112, +- 205, 46, 26, 208, 114, 243, 162, 238, 233, 133, +- 104, 87, 143, 47, 192, 10, 202, 80, 10, 200, +- 64, 148, 225, 160, 198, 104, 26, 8, 179, 137, +- 183, 114, 120, 8, 166, 162, 212, 190, 66, 43, +- 158, 115, 0, 243, 194, 21, 127, 232, 167, 51, +- 224, 111, 84, 87, 203, 165, 176, 11, 154, 0, +- 3, 220, 244, 24, 189, 16, 206, 14, 214, 182, +- 11, 108, 8, 105, 107, 211, 239, 36, 12, 150, +- 29, 39, 30, 176, 5, 172, 208, 11, 14, 205, +- 12, 218, 80, 11, 235, 73, 9, 44, 42, 155, +- 134, 128, 49, 181, 60, 9, 170, 48, 10, 230, +- 161, 5, 31, 240, 0, 125, 253, 0, 160, 182, +- 23, 147, 64, 180, 23, 58, 117, 84, 23, 5, +- 130, 112, 42, 174, 0, 3, 150, 240, 151, 171, +- 144, 58, 1, 205, 174, 114, 80, 205, 160, 108, +- 214, 3, 25, 209, 185, 160, 13, 202, 208, 0, +- 3, 224, 1, 151, 32, 166, 152, 57, 48, 134, +- 254, 112, 83, 16, 115, 45, 114, 184, 6, 125, +- 112, 7, 123, 160, 5, 241, 178, 0, 125, 61, +- 2, 216, 196, 23, 144, 80, 96, 21, 91, 177, +- 253, 19, 5, 83, 112, 216, 192, 80, 2, 95, +- 96, 23, 82, 234, 9, 165, 128, 8, 65, 27, +- 180, 110, 74, 8, 163, 221, 182, 54, 157, 205, +- 181, 192, 128, 185, 240, 10, 208, 160, 11, 13, +- 160, 0, 24, 0, 6, 208, 32, 158, 208, 208, +- 30, 234, 42, 223, 85, 144, 5, 216, 45, 23, +- 57, 208, 218, 44, 227, 221, 22, 240, 4, 90, +- 241, 29, 170, 64, 157, 215, 170, 147, 196, 147, +- 208, 201, 128, 4, 102, 96, 25, 32, 94, 23, +- 147, 120, 7, 125, 176, 6, 113, 160, 6, 214, +- 60, 55, 106, 122, 223, 114, 4, 79, 39, 148, +- 11, 255, 77, 1, 20, 112, 5, 170, 48, 182, +- 205, 12, 205, 159, 64, 57, 120, 144, 221, 219, +- 157, 3, 38, 80, 43, 101, 195, 50, 19, 238, +- 203, 189, 1, 185, 243, 188, 188, 62, 48, 5, +- 202, 128, 13, 201, 192, 6, 110, 224, 86, 121, +- 0, 226, 82, 174, 4, 34, 126, 6, 36, 222, +- 7, 120, 96, 226, 220, 226, 56, 17, 44, 154, +- 151, 227, 148, 118, 201, 10, 124, 50, 10, 142, +- 176, 33, 215, 225, 227, 77, 2, 228, 182, 242, +- 0, 53, 240, 5, 68, 94, 34, 229, 120, 169, +- 137, 169, 2, 6, 150, 5, 229, 186, 206, 48, +- 64, 16, 166, 160, 8, 192, 81, 62, 229, 32, +- 142, 25, 84, 238, 222, 115, 49, 232, 132, 110, +- 23, 215, 113, 25, 218, 17, 34, 78, 178, 232, +- 181, 98, 1, 109, 30, 32, 37, 162, 16, 151, +- 64, 184, 152, 26, 127, 73, 94, 10, 73, 9, +- 12, 56, 128, 16, 218, 148, 7, 121, 240, 5, +- 182, 17, 234, 162, 158, 3, 184, 129, 27, 218, +- 113, 234, 218, 209, 31, 253, 17, 34, 172, 206, +- 232, 38, 160, 3, 0, 82, 225, 145, 206, 16, +- 148, 142, 169, 116, 126, 164, 186, 144, 12, 187, +- 237, 16, 150, 20, 9, 118, 96, 7, 95, 240, +- 5, 216, 145, 29, 168, 158, 234, 170, 174, 1, +- 31, 160, 3, 184, 17, 236, 120, 33, 235, 179, +- 254, 16, 144, 75, 184, 136, 153, 106, 22, 185, +- 6, 147, 192, 10, 174, 176, 1, 60, 65, 19, +- 145, 240, 230, 207, 222, 17, 128, 64, 184, 33, +- 96, 164, 86, 144, 6, 225, 226, 165, 154, 32, +- 1, 223, 190, 238, 21, 225, 10, 75, 128, 2, +- 54, 240, 3, 66, 148, 6, 228, 178, 11, 192, +- 192, 4, 236, 158, 239, 2, 17, 16, 0, 59}; +- +diff -up php-5.4.0RC5/main/php_logos.c.easter php-5.4.0RC5/main/php_logos.c +--- php-5.4.0RC5/main/php_logos.c.easter 2012-01-18 17:17:17.895031787 +0100 ++++ php-5.4.0RC5/main/php_logos.c 2012-01-18 17:21:46.877044070 +0100 +@@ -56,7 +56,6 @@ int php_init_info_logos(void) + return FAILURE; + + php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); +- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); + php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); + + return SUCCESS; diff --git a/SOURCES/php-5.4.0-phpize.patch b/SOURCES/php-5.4.0-phpize.patch new file mode 100644 index 0000000..e666e45 --- /dev/null +++ b/SOURCES/php-5.4.0-phpize.patch @@ -0,0 +1,34 @@ +--- php-5.4.0RC5/scripts/phpize.in.orig 2012-01-18 17:13:54.018022983 +0100 ++++ php-5.4.0RC5/scripts/phpize.in 2012-01-18 17:14:40.614024941 +0100 +@@ -162,6 +162,15 @@ + $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 @@ + + # Version + --version|-v) ++ phpize_check_headers + phpize_print_api_numbers + exit 0 + ;; + + # Default + *) ++ phpize_check_headers ++ + phpize_check_configm4 0 + + phpize_check_build_files diff --git a/SOURCES/php-5.4.15-system-libzip.patch b/SOURCES/php-5.4.15-system-libzip.patch new file mode 100644 index 0000000..7e8642b --- /dev/null +++ b/SOURCES/php-5.4.15-system-libzip.patch @@ -0,0 +1,500 @@ +diff -up php-5.4.15/ext/zip/config.m4.systzip php-5.4.15/ext/zip/config.m4 +--- php-5.4.15/ext/zip/config.m4.systzip 2013-05-08 07:41:20.000000000 +0200 ++++ php-5.4.15/ext/zip/config.m4 2013-05-09 06:46:26.084673644 +0200 +@@ -13,65 +13,116 @@ fi + PHP_ARG_WITH(pcre-dir, pcre install prefix, + [ --with-pcre-dir ZIP: pcre install prefix], no, no) + ++PHP_ARG_WITH(libzip, libzip, ++[ --with-libzip[=DIR] ZIP: use libzip], no, no) ++ + if test "$PHP_ZIP" != "no"; then ++ if test "$PHP_LIBZIP" != "no"; then ++ ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ ++ dnl system libzip, depends on libzip ++ AC_MSG_CHECKING(for libzip) ++ if test -r $PHP_LIBZIP/include/zip.h; then ++ LIBZIP_CFLAGS="-I$PHP_LIBZIP/include" ++ LIBZIP_LIBDIR="$PHP_LIBZIP/$PHP_LIBDIR" ++ AC_MSG_RESULT(from option: found in $PHP_LIBZIP) ++ ++ elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libzip; then ++ LIBZIP_CFLAGS=`$PKG_CONFIG libzip --cflags` ++ LIBZIP_LIBDIR=`$PKG_CONFIG libzip --variable=libdir` ++ AC_MSG_RESULT(from pkgconfig: found in $LIBZIP_LIBDIR) + +- if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then +- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then +- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" +- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then +- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" + else +- AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"]) ++ for i in /usr/local /usr; do ++ if test -r $i/include/zip.h; then ++ LIBZIP_CFLAGS="-I$i/include" ++ LIBZIP_LIBDIR="$i/$PHP_LIBDIR" ++ AC_MSG_RESULT(in default path: found in $i) ++ break ++ fi ++ done + fi ++ ++ if test -z "$LIBZIP_LIBDIR"; then ++ AC_MSG_RESULT(not found) ++ AC_MSG_ERROR(Please reinstall the libzip distribution) ++ fi ++ ++ dnl Could not think of a simple way to check libzip for overwrite support ++ PHP_CHECK_LIBRARY(zip, zip_open, ++ [ ++ PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD) ++ AC_DEFINE(HAVE_LIBZIP,1,[ ]) ++ ], [ ++ AC_MSG_ERROR(could not find usable libzip) ++ ], [ ++ -L$LIBZIP_LIBDIR ++ ]) ++ ++ AC_DEFINE(HAVE_ZIP,1,[ ]) ++ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS) ++ PHP_SUBST(ZIP_SHARED_LIBADD) + else +- for i in /usr/local /usr; do +- if test -f "$i/include/zlib/zlib.h"; then +- PHP_ZLIB_DIR="$i" +- PHP_ZLIB_INCDIR="$i/include/zlib" +- elif test -f "$i/include/zlib.h"; then +- PHP_ZLIB_DIR="$i" +- PHP_ZLIB_INCDIR="$i/include" ++ ++ dnl bundled libzip, depends on zlib ++ if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then ++ if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then ++ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" ++ elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then ++ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" ++ else ++ AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"]) + fi +- done +- fi ++ else ++ for i in /usr/local /usr; do ++ if test -f "$i/include/zlib/zlib.h"; then ++ PHP_ZLIB_DIR="$i" ++ PHP_ZLIB_INCDIR="$i/include/zlib" ++ elif test -f "$i/include/zlib.h"; then ++ PHP_ZLIB_DIR="$i" ++ PHP_ZLIB_INCDIR="$i/include" ++ fi ++ done ++ fi + +- dnl # zlib +- AC_MSG_CHECKING([for the location of zlib]) +- if test "$PHP_ZLIB_DIR" = "no"; then +- AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located]) +- else +- AC_MSG_RESULT([$PHP_ZLIB_DIR]) +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD) +- PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR) +- fi ++ dnl # zlib ++ AC_MSG_CHECKING([for the location of zlib]) ++ if test "$PHP_ZLIB_DIR" = "no"; then ++ AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located]) ++ else ++ AC_MSG_RESULT([$PHP_ZLIB_DIR]) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD) ++ PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR) ++ fi + +- dnl This is PECL build, check if bundled PCRE library is used +- old_CPPFLAGS=$CPPFLAGS +- CPPFLAGS=$INCLUDES +- AC_EGREP_CPP(yes,[ ++ dnl This is PECL build, check if bundled PCRE library is used ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=$INCLUDES ++ AC_EGREP_CPP(yes,[ + #include
+ #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) + yes + #endif +- ],[ +- PHP_PCRE_REGEX=yes +- ],[ +- AC_EGREP_CPP(yes,[ ++ ],[ ++ PHP_PCRE_REGEX=yes ++ ],[ ++ AC_EGREP_CPP(yes,[ + #include
+ #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) + yes + #endif +- ],[ +- PHP_PCRE_REGEX=pecl +- ],[ +- PHP_PCRE_REGEX=no ++ ],[ ++ PHP_PCRE_REGEX=pecl ++ ],[ ++ PHP_PCRE_REGEX=no ++ ]) + ]) +- ]) +- CPPFLAGS=$old_CPPFLAGS ++ CPPFLAGS=$old_CPPFLAGS + +- PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ ++ PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ + lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \ + lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \ + lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \ +@@ -98,10 +149,11 @@ yes + lib/zip_source_open.c lib/zip_source_pkware.c lib/zip_source_pop.c \ + lib/zip_source_read.c lib/zip_source_stat.c" + +- AC_DEFINE(HAVE_ZIP,1,[ ]) +- PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) +- PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) +- PHP_SUBST(ZIP_SHARED_LIBADD) ++ AC_DEFINE(HAVE_ZIP,1,[ ]) ++ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) ++ PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) ++ PHP_SUBST(ZIP_SHARED_LIBADD) ++ fi + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT +diff -up php-5.4.15/ext/zip/php_zip.c.systzip php-5.4.15/ext/zip/php_zip.c +--- php-5.4.15/ext/zip/php_zip.c.systzip 2013-05-08 07:41:20.000000000 +0200 ++++ php-5.4.15/ext/zip/php_zip.c 2013-05-09 06:50:33.286058049 +0200 +@@ -30,8 +30,232 @@ + #include "ext/pcre/php_pcre.h" + #include "ext/standard/php_filestat.h" + #include "php_zip.h" ++#if defined(HAVE_LIBZIP) ++#include ++ ++/* Copied from libzip 0.10 */ ++ ++/* state of change of a file in zip archive */ ++ ++enum zip_state { ZIP_ST_UNCHANGED, ZIP_ST_DELETED, ZIP_ST_REPLACED, ++ ZIP_ST_ADDED, ZIP_ST_RENAMED }; ++ ++/* error source for layered sources */ ++ ++enum zip_les { ZIP_LES_NONE, ZIP_LES_UPPER, ZIP_LES_LOWER, ZIP_LES_INVAL }; ++ ++typedef zip_int64_t (*zip_source_layered_callback)(struct zip_source *, void *, ++ void *, zip_uint64_t, ++ enum zip_source_cmd); ++ ++struct zip_error { ++ int zip_err; /* libzip error code (ZIP_ER_*) */ ++ int sys_err; /* copy of errno (E*) or zlib error code */ ++ char *str; /* string representation or NULL */ ++}; ++ ++/* zip archive, part of API */ ++ ++struct zip { ++ char *zn; /* file name */ ++ FILE *zp; /* file */ ++ struct zip_error error; /* error information */ ++ ++ unsigned int flags; /* archive global flags */ ++ unsigned int ch_flags; /* changed archive global flags */ ++ ++ char *default_password; /* password used when no other supplied */ ++ ++ struct zip_cdir *cdir; /* central directory */ ++ char *ch_comment; /* changed archive comment */ ++ int ch_comment_len; /* length of changed zip archive ++ * comment, -1 if unchanged */ ++ zip_uint64_t nentry; /* number of entries */ ++ zip_uint64_t nentry_alloc; /* number of entries allocated */ ++ struct zip_entry *entry; /* entries */ ++ int nfile; /* number of opened files within archive */ ++ int nfile_alloc; /* number of files allocated */ ++ struct zip_file **file; /* opened files within archive */ ++}; ++ ++/* file in zip archive, part of API */ ++ ++struct zip_file { ++ struct zip *za; /* zip archive containing this file */ ++ struct zip_error error; /* error information */ ++ int eof; ++ struct zip_source *src; /* data source */ ++}; ++ ++/* zip archive directory entry (central or local) */ ++ ++struct zip_dirent { ++ unsigned short version_madeby; /* (c) version of creator */ ++ unsigned short version_needed; /* (cl) version needed to extract */ ++ unsigned short bitflags; /* (cl) general purpose bit flag */ ++ unsigned short comp_method; /* (cl) compression method used */ ++ time_t last_mod; /* (cl) time of last modification */ ++ unsigned int crc; /* (cl) CRC-32 of uncompressed data */ ++ unsigned int comp_size; /* (cl) size of commpressed data */ ++ unsigned int uncomp_size; /* (cl) size of uncommpressed data */ ++ char *filename; /* (cl) file name (NUL-terminated) */ ++ unsigned short filename_len; /* (cl) length of filename (w/o NUL) */ ++ char *extrafield; /* (cl) extra field */ ++ unsigned short extrafield_len; /* (cl) length of extra field */ ++ char *comment; /* (c) file comment */ ++ unsigned short comment_len; /* (c) length of file comment */ ++ unsigned short disk_number; /* (c) disk number start */ ++ unsigned short int_attrib; /* (c) internal file attributes */ ++ unsigned int ext_attrib; /* (c) external file attributes */ ++ unsigned int offset; /* (c) offset of local header */ ++}; ++ ++/* zip archive central directory */ ++ ++struct zip_cdir { ++ struct zip_dirent *entry; /* directory entries */ ++ int nentry; /* number of entries */ ++ ++ unsigned int size; /* size of central direcotry */ ++ unsigned int offset; /* offset of central directory in file */ ++ char *comment; /* zip archive comment */ ++ unsigned short comment_len; /* length of zip archive comment */ ++}; ++ ++struct zip_source { ++ struct zip_source *src; ++ union { ++ zip_source_callback f; ++ zip_source_layered_callback l; ++ } cb; ++ void *ud; ++ enum zip_les error_source; ++ int is_open; ++}; ++ ++/* entry in zip archive directory */ ++ ++struct zip_entry { ++ enum zip_state state; ++ struct zip_source *source; ++ char *ch_filename; ++ char *ch_extra; ++ int ch_extra_len; ++ char *ch_comment; ++ int ch_comment_len; ++}; ++ ++void _zip_dirent_finalize(struct zip_dirent *zde) ++{ ++ free(zde->filename); ++ zde->filename = NULL; ++ free(zde->extrafield); ++ zde->extrafield = NULL; ++ free(zde->comment); ++ zde->comment = NULL; ++} ++ ++void _zip_cdir_free(struct zip_cdir *cd) ++{ ++ int i; ++ ++ if (!cd) ++ return; ++ ++ for (i=0; inentry; i++) ++ _zip_dirent_finalize(cd->entry+i); ++ free(cd->comment); ++ free(cd->entry); ++ free(cd); ++} ++ ++void _zip_error_fini(struct zip_error *err) ++{ ++ free(err->str); ++ err->str = NULL; ++} ++ ++void _zip_error_init(struct zip_error *err) ++{ ++ err->zip_err = ZIP_ER_OK; ++ err->sys_err = 0; ++ err->str = NULL; ++} ++ ++void _zip_unchange_data(struct zip_entry *ze) ++{ ++ if (ze->source) { ++ zip_source_free(ze->source); ++ ze->source = NULL; ++ } ++ ++ ze->state = ze->ch_filename ? ZIP_ST_RENAMED : ZIP_ST_UNCHANGED; ++} ++ ++void _zip_entry_free(struct zip_entry *ze) ++{ ++ free(ze->ch_filename); ++ ze->ch_filename = NULL; ++ free(ze->ch_extra); ++ ze->ch_extra = NULL; ++ ze->ch_extra_len = -1; ++ free(ze->ch_comment); ++ ze->ch_comment = NULL; ++ ze->ch_comment_len = -1; ++ ++ _zip_unchange_data(ze); ++} ++ ++void ++_zip_error_set(struct zip_error *err, int ze, int se) ++{ ++ if (err) { ++ err->zip_err = ze; ++ err->sys_err = se; ++ } ++} ++ ++void _zip_free(struct zip *za) ++{ ++ int i; ++ ++ if (za == NULL) ++ return; ++ ++ if (za->zn) ++ free(za->zn); ++ ++ if (za->zp) ++ fclose(za->zp); ++ ++ free(za->default_password); ++ _zip_cdir_free(za->cdir); ++ free(za->ch_comment); ++ ++ if (za->entry) { ++ for (i=0; inentry; i++) { ++ _zip_entry_free(za->entry+i); ++ } ++ free(za->entry); ++ } ++ ++ for (i=0; infile; i++) { ++ if (za->file[i]->error.zip_err == ZIP_ER_OK) { ++ _zip_error_set(&za->file[i]->error, ZIP_ER_ZIPCLOSED, 0); ++ za->file[i]->za = NULL; ++ } ++ } ++ ++ free(za->file); ++ free(za); ++ return; ++} ++ ++ ++#else + #include "lib/zip.h" + #include "lib/zipint.h" ++#endif + + /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */ + static PHP_NAMED_FUNCTION(zif_zip_open); +@@ -1631,6 +1855,10 @@ static ZIPARCHIVE_METHOD(addEmptyDir) + } + + idx = zip_stat(intern, s, 0, &sb); ++ /* We don't care about the NOENT status error here. */ ++ if (intern->error.zip_err == ZIP_ER_NOENT) { ++ _zip_error_set(&intern->error, ZIP_ER_OK, 0); ++ } + if (idx >= 0) { + RETVAL_FALSE; + } else { +@@ -1853,6 +2081,10 @@ static ZIPARCHIVE_METHOD(addFromString) + } + + cur_idx = zip_name_locate(intern, (const char *)name, 0); ++ /* We don't care about the NOENT status error here. */ ++ if (intern->error.zip_err == ZIP_ER_NOENT) { ++ _zip_error_set(&intern->error, ZIP_ER_OK, 0); ++ } + /* TODO: fix _zip_replace */ + if (cur_idx >= 0) { + if (zip_delete(intern, cur_idx) == -1) { +@@ -2877,5 +3109,9 @@ static PHP_MINFO_FUNCTION(zip) + php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING); +- php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION); ++#if defined(HAVE_LIBZIP) ++ php_info_print_table_row(2, "Compiled against libzip version", LIBZIP_VERSION); ++#else ++ php_info_print_table_row(2, "Bundled libzip version", LIBZIP_VERSION); ++#endif + + php_info_print_table_end(); + } +diff -up php-5.4.15/ext/zip/php_zip.h.systzip php-5.4.15/ext/zip/php_zip.h +--- php-5.4.15/ext/zip/php_zip.h.systzip 2013-05-08 07:41:20.000000000 +0200 ++++ php-5.4.15/ext/zip/php_zip.h 2013-05-09 06:46:26.086673656 +0200 +@@ -28,7 +28,11 @@ extern zend_module_entry zip_module_entr + #include "TSRM.h" + #endif + ++#if defined(HAVE_LIBZIP) ++#include ++#else + #include "lib/zip.h" ++#endif + + #define PHP_ZIP_VERSION_STRING "1.11.0" + +diff -up php-5.4.15/ext/zip/tests/bug38943.phpt.systzip php-5.4.15/ext/zip/tests/bug38943.phpt +--- php-5.4.15/ext/zip/tests/bug38943.phpt.systzip 2013-05-08 07:41:20.000000000 +0200 ++++ php-5.4.15/ext/zip/tests/bug38943.phpt 2013-05-09 06:46:26.088673667 +0200 +@@ -27,7 +27,7 @@ array(1) { + [0]=> + int(1) + } +-object(myZip)#1 (%d) { ++object(myZip)#%d (%d) { + ["test":"myZip":private]=> + int(0) + ["testp"]=> +diff -up php-5.4.15/ext/zip/tests/pecl12414.phpt.systzip php-5.4.15/ext/zip/tests/pecl12414.phpt +--- php-5.4.15/ext/zip/tests/pecl12414.phpt.systzip 2013-05-08 07:41:20.000000000 +0200 ++++ php-5.4.15/ext/zip/tests/pecl12414.phpt 2013-05-09 06:46:26.088673667 +0200 +@@ -5,6 +5,8 @@ Bug #12414 ( extracting files from damag + /*$ */ + if(!extension_loaded('zip')) die('skip'); + ?> ++--XFAIL-- ++Doesn't work with system libzip (zip_readfile could not read from ...) + --FILE-- + ++#else + #include "lib/zip.h" ++#endif + + #include "php_streams.h" + #include "ext/standard/file.h" diff --git a/SOURCES/php-5.4.16-CVE-2013-4248.patch b/SOURCES/php-5.4.16-CVE-2013-4248.patch new file mode 100644 index 0000000..c5da270 --- /dev/null +++ b/SOURCES/php-5.4.16-CVE-2013-4248.patch @@ -0,0 +1,211 @@ +From 2874696a5a8d46639d261571f915c493cd875897 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev +Date: Tue, 13 Aug 2013 22:20:33 -0700 +Subject: [PATCH] Fix CVE-2013-4073 - handling of certs with null bytes + +--- + NEWS | 4 ++ + ext/openssl/openssl.c | 86 ++++++++++++++++++++++++++++++++++++- + ext/openssl/tests/cve2013_4073.pem | 28 ++++++++++++ + ext/openssl/tests/cve2013_4073.phpt | 19 ++++++++ + 4 files changed, 135 insertions(+), 2 deletions(-) + create mode 100644 ext/openssl/tests/cve2013_4073.pem + create mode 100644 ext/openssl/tests/cve2013_4073.phpt + +diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c +index d7ac117..c32748c 100644 +--- a/ext/openssl/openssl.c ++++ b/ext/openssl/openssl.c +@@ -1398,6 +1398,74 @@ PHP_FUNCTION(openssl_x509_check_private_key) + } + /* }}} */ + ++/* Special handling of subjectAltName, see CVE-2013-4073 ++ * Christian Heimes ++ */ ++ ++static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension) ++{ ++ GENERAL_NAMES *names; ++ const X509V3_EXT_METHOD *method = NULL; ++ long i, length, num; ++ const unsigned char *p; ++ ++ method = X509V3_EXT_get(extension); ++ if (method == NULL) { ++ return -1; ++ } ++ ++ p = extension->value->data; ++ length = extension->value->length; ++ if (method->it) { ++ names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, &p, length, ++ ASN1_ITEM_ptr(method->it))); ++ } else { ++ names = (GENERAL_NAMES*)(method->d2i(NULL, &p, length)); ++ } ++ if (names == NULL) { ++ return -1; ++ } ++ ++ num = sk_GENERAL_NAME_num(names); ++ for (i = 0; i < num; i++) { ++ GENERAL_NAME *name; ++ ASN1_STRING *as; ++ name = sk_GENERAL_NAME_value(names, i); ++ switch (name->type) { ++ case GEN_EMAIL: ++ BIO_puts(bio, "email:"); ++ as = name->d.rfc822Name; ++ BIO_write(bio, ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ break; ++ case GEN_DNS: ++ BIO_puts(bio, "DNS:"); ++ as = name->d.dNSName; ++ BIO_write(bio, ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ break; ++ case GEN_URI: ++ BIO_puts(bio, "URI:"); ++ as = name->d.uniformResourceIdentifier; ++ BIO_write(bio, ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ break; ++ default: ++ /* use builtin print for GEN_OTHERNAME, GEN_X400, ++ * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID ++ */ ++ GENERAL_NAME_print(bio, name); ++ } ++ /* trailing ', ' except for last element */ ++ if (i < (num - 1)) { ++ BIO_puts(bio, ", "); ++ } ++ } ++ sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free); ++ ++ return 0; ++} ++ + /* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true]) + Returns an array of the fields/values of the CERT */ + PHP_FUNCTION(openssl_x509_parse) +@@ -1494,15 +1562,29 @@ PHP_FUNCTION(openssl_x509_parse) + + + for (i = 0; i < X509_get_ext_count(cert); i++) { ++ int nid; + extension = X509_get_ext(cert, i); +- if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != NID_undef) { ++ nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension)); ++ if (nid != NID_undef) { + extname = (char *)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension))); + } else { + OBJ_obj2txt(buf, sizeof(buf)-1, X509_EXTENSION_get_object(extension), 1); + extname = buf; + } + bio_out = BIO_new(BIO_s_mem()); +- if (X509V3_EXT_print(bio_out, extension, 0, 0)) { ++ if (nid == NID_subject_alt_name) { ++ if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) { ++ add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); ++ } else { ++ zval_dtor(return_value); ++ if (certresource == -1 && cert) { ++ X509_free(cert); ++ } ++ BIO_free(bio_out); ++ RETURN_FALSE; ++ } ++ } ++ else if (X509V3_EXT_print(bio_out, extension, 0, 0)) { + BIO_get_mem_ptr(bio_out, &bio_buf); + add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); + } else { +diff --git a/ext/openssl/tests/cve2013_4073.pem b/ext/openssl/tests/cve2013_4073.pem +new file mode 100644 +index 0000000..7ebb994 +--- /dev/null ++++ b/ext/openssl/tests/cve2013_4073.pem +@@ -0,0 +1,28 @@ ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/ext/openssl/tests/cve2013_4073.phpt b/ext/openssl/tests/cve2013_4073.phpt +new file mode 100644 +index 0000000..e676ddf +--- /dev/null ++++ b/ext/openssl/tests/cve2013_4073.phpt +@@ -0,0 +1,19 @@ ++--TEST-- ++CVE 2013-4073: Null-byte certificate handling ++--SKIPIF-- ++ 'CA:FALSE', ++ 'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C', ++ 'keyUsage' => 'Digital Signature, Non Repudiation, Key Encipherment', ++ 'subjectAltName' => 'DNS:altnull.python.org' . "\0" . 'example.com, email:null@python.org' . "\0" . 'user@example.org, URI:http://null.python.org' . "\0" . 'http://example.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++', ++) +-- +1.7.11.5 + +From c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev +Date: Mon, 19 Aug 2013 01:02:12 -0700 +Subject: [PATCH] fix using wrong buffer pointer + +--- + ext/openssl/openssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c +index c7a9f5c..e7672e4 100644 +--- a/ext/openssl/openssl.c ++++ b/ext/openssl/openssl.c +@@ -1502,6 +1502,7 @@ PHP_FUNCTION(openssl_x509_parse) + bio_out = BIO_new(BIO_s_mem()); + if (nid == NID_subject_alt_name) { + if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) { ++ BIO_get_mem_ptr(bio_out, &bio_buf); + add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); + } else { + zval_dtor(return_value); +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.16-fpm.patch b/SOURCES/php-5.4.16-fpm.patch new file mode 100644 index 0000000..4a32fcf --- /dev/null +++ b/SOURCES/php-5.4.16-fpm.patch @@ -0,0 +1,31 @@ +From 9f6ca9bc6400fc9c8eaebf963f6eb048dde4b34f Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 24 May 2013 12:09:05 +0200 +Subject: [PATCH] Fixed Bug #64915 (error_log ignored when daemonize=0) + +Use configured error_log file when stderr is not a tty. +So only use tty during interactive debug run. +--- + NEWS | 3 +++ + sapi/fpm/fpm/fpm_stdio.c | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c +index 10b867d..d81e101 100644 +--- a/sapi/fpm/fpm/fpm_stdio.c ++++ b/sapi/fpm/fpm/fpm_stdio.c +@@ -291,7 +291,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ + fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */ + } else { + fpm_globals.error_log_fd = fd; ++#if HAVE_UNISTD_H ++ if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) { ++#else + if (fpm_global_config.daemonize) { ++#endif + zlog_set_fd(fpm_globals.error_log_fd); + } + } +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.16-gc.patch b/SOURCES/php-5.4.16-gc.patch new file mode 100644 index 0000000..a1f4323 --- /dev/null +++ b/SOURCES/php-5.4.16-gc.patch @@ -0,0 +1,83 @@ +From 3c87945c95c9c31986e690bb046c70e58c8d8896 Mon Sep 17 00:00:00 2001 +From: Xinchen Hui +Date: Wed, 5 Jun 2013 17:25:00 +0800 +Subject: [PATCH] Fixed bug #64960 (Segfault in gc_zval_possible_root) + +--- + NEWS | 2 ++ + Zend/tests/bug64960.phpt | 40 ++++++++++++++++++++++++++++++++++++++++ + Zend/zend_execute_API.c | 6 ++---- + 3 files changed, 44 insertions(+), 4 deletions(-) + create mode 100644 Zend/tests/bug64960.phpt + +diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt +new file mode 100644 +index 0000000..b31cca3 +--- /dev/null ++++ b/Zend/tests/bug64960.phpt +@@ -0,0 +1,40 @@ ++--TEST-- ++Bug #64960 (Segfault in gc_zval_possible_root) ++--FILE-- ++_trace = debug_backtrace(); ++ ++ throw $e; ++}); ++ ++// trigger error handler ++$a['waa']; ++?> ++--EXPECTF-- ++Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3 ++ ++Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19 ++Stack trace: ++#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array) ++#1 %sbug64960.php(9): ob_end_clean() ++#2 [internal function]: ExceptionHandler->__invoke(Object(Exception)) ++#3 {main} ++ thrown in %sbug64960.php on line 19 +diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c +index 9781889..687520d 100644 +--- a/Zend/zend_execute_API.c ++++ b/Zend/zend_execute_API.c +@@ -263,15 +263,13 @@ void shutdown_executor(TSRMLS_D) /* {{{ */ + if (EG(user_error_handler)) { + zeh = EG(user_error_handler); + EG(user_error_handler) = NULL; +- zval_dtor(zeh); +- FREE_ZVAL(zeh); ++ zval_ptr_dtor(&zeh); + } + + if (EG(user_exception_handler)) { + zeh = EG(user_exception_handler); + EG(user_exception_handler) = NULL; +- zval_dtor(zeh); +- FREE_ZVAL(zeh); ++ zval_ptr_dtor(&zeh); + } + + zend_stack_destroy(&EG(user_error_handlers_error_reporting)); +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.16-man.patch b/SOURCES/php-5.4.16-man.patch new file mode 100644 index 0000000..6bd0577 --- /dev/null +++ b/SOURCES/php-5.4.16-man.patch @@ -0,0 +1,668 @@ +From c940aab7895fa4cb109e7790ae14080090b04959 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 10:42:47 +0200 +Subject: [PATCH] Fixed Bug #65143 Missing php-cgi man page + +Currently php-cgi man page is a simple redirect to +php (CLI) man page. + +Could be splited / improved in the future. +--- + sapi/cgi/Makefile.frag | 3 +++ + sapi/cgi/config9.m4 | 2 ++ + sapi/cgi/php-cgi.1.in | 1 + + sapi/cli/php.1.in | 2 ++ + 4 files changed, 8 insertions(+) + create mode 100644 sapi/cgi/php-cgi.1.in + +diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag +index 505119e..d54dd40 100644 +--- a/sapi/cgi/Makefile.frag ++++ b/sapi/cgi/Makefile.frag +@@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) + install-cgi: $(SAPI_CGI_PATH) + @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" + @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" ++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 ++ @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 + +diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 +index 67251ae..49e61c8 100644 +--- a/sapi/cgi/config9.m4 ++++ b/sapi/cgi/config9.m4 +@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then + dnl Expose to Makefile + PHP_SUBST(SAPI_CGI_PATH) + PHP_SUBST(BUILD_CGI) ++ ++ PHP_OUTPUT(sapi/cgi/php-cgi.1) + else + AC_MSG_RESULT(yes) + fi +diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in +new file mode 100644 +index 0000000..340e6c5 +--- /dev/null ++++ b/sapi/cgi/php-cgi.1.in +@@ -0,0 +1 @@ ++.so man1/php.1 +diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in +index 0e9d07a..6f0266d 100644 +--- a/sapi/cli/php.1.in ++++ b/sapi/cli/php.1.in +@@ -1,6 +1,8 @@ + .TH PHP 1 "2013" "The PHP Group" "Scripting Language" + .SH NAME + php \- PHP Command Line Interface 'CLI' ++.P ++php-cgi \- PHP Command Gateway Interface 'CGI' + .SH SYNOPSIS + .B php + [options] [ +-- +1.7.11.5 + +From f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 10:46:50 +0200 +Subject: [PATCH] Fixed Bug #65142 Missing phar man page + +Simple man page from phar help output. +--- + NEWS | 3 + + ext/phar/Makefile.frag | 4 + + ext/phar/config.m4 | 2 + + ext/phar/phar.1.in | 523 ++++++++++++++++++++++++++++++++++++++++++++++++ + ext/phar/phar.phar.1.in | 1 + + 5 files changed, 533 insertions(+) + create mode 100644 ext/phar/phar.1.in + create mode 100644 ext/phar/phar.phar.1.in + +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag +index b1c820f..ed6de9f 100644 +--- a/ext/phar/Makefile.frag ++++ b/ext/phar/Makefile.frag +@@ -40,3 +40,7 @@ install-pharcmd: pharcmd + $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) + -@rm -f $(INSTALL_ROOT)$(bindir)/phar + $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar ++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 ++ @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 ++ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 ++ +diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 +index 2ac7f3d..d424060 100644 +--- a/ext/phar/config.m4 ++++ b/ext/phar/config.m4 +@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then + PHP_ADD_EXTENSION_DEP(phar, hash, true) + PHP_ADD_EXTENSION_DEP(phar, spl, true) + PHP_ADD_MAKEFILE_FRAGMENT ++ ++ PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1) + fi +diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in +new file mode 100644 +index 0000000..259a2ba +--- /dev/null ++++ b/ext/phar/phar.1.in +@@ -0,0 +1,523 @@ ++.TH PHAR 1 "2013" "The PHP Group" "User Commands" ++.SH NAME ++phar, phar.phar \- PHAR (PHP archive) command line tool ++.SH SYNOPSIS ++.B phar ++ [options] ... ++.LP ++.SH DESCRIPTION ++The \fBPHAR\fP file format provides a way to put entire PHP applications into a single ++file called a "phar" (PHP Archive) for easy distribution and installation. ++.P ++With the \fBphar\fP command you can create, update or extract PHP archives. ++.P ++Commands: ++add compress delete extract help help-list info list meta-del ++meta-get meta-set pack sign stub-get stub-set tree version ++ ++.SH add command ++Add entries to a PHAR package. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B ... ++Any number of input files and directories. If -i is in ++use then ONLY files and matching the given regular ++expression are being packed. If -x is given then files ++matching that regular expression are NOT being packed. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-a \fIalias\fP ++Provide an \fIalias\fP name for the phar file. ++.TP ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-l \fIlevel\fP ++Number of preceding subdirectories to strip from file entries ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++ ++.SH compress command ++Compress or uncompress all files or a selected entry. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++ ++.SH delete command ++Delete entry from a PHAR archive ++.P ++Required arguments: ++.TP 15 ++.PD ++.B \-e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++ ++.SH extract command ++Extract a PHAR package to a directory. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B -x \fIregex\fP ++Regular expression for input files to exclude. ++.TP ++.PD ++.B ... ++Directory to extract to (defaults to '.'). ++ ++ ++.SH help command ++This help or help for a selected command. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B ... ++Optional command to retrieve help for. ++ ++.SH help-list command ++Lists available commands. ++ ++.SH info command ++Get information about a PHAR package. ++.P ++By using -k it is possible to return a single value. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH list command ++List contents of a PHAR archive. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B -x \fIregex\fP ++Regular expression for input files to exclude. ++ ++ ++.SH meta-del command ++Delete meta information of a PHAR entry or a PHAR package. ++.P ++If -k is given then the metadata is expected to be an array and the ++given index is being deleted. ++.P ++If something was deleted the return value is 0 otherwise it is 1. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH meta-get command ++Get meta information of a PHAR entry or a PHAR package in serialized from. If ++no output file is specified for meta data then stdout is being used. ++You can also specify a particular index using -k. In that case the ++metadata is expected to be an array and the value of the given index ++is returned using echo rather than using serialize. If that index does ++not exist or no meta data is present then the return value is 1. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH meta-set command ++Set meta data of a PHAR entry or a PHAR package using serialized input. If no ++input file is specified for meta data then stdin is being used. You can ++also specify a particular index using -k. In that case the metadata is ++expected to be an array and the value of the given index is being set. ++If the metadata is not present or empty a new array will be created. ++If the metadata is present and a flat value then the return value is ++1. Also using -k the input is been taken directly rather then being ++serialized. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B -m \fImeta\fP ++Meta data to store with entry (serialized php data). ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B -e \fIentry\fP ++Name of \fIentry\fP to work on (must include PHAR internal ++directory name if any). ++.TP ++.PD ++.B -k \fIindex\fP ++Subscription \fIindex\fP to work on. ++ ++.SH pack command ++Pack files into a PHAR archive. ++.P ++When using -s , then the stub file is being excluded from the ++list of input files/dirs.To create an archive that contains PEAR class ++PHP_Archive then point -p argument to PHP/Archive.php. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B ... ++Any number of input files and directories. If -i is in ++use then ONLY files and matching the given regular ++expression are being packed. If -x is given then files ++matching that regular expression are NOT being packed. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-a \fIalias\fP ++Provide an \fIalias\fP name for the phar file. ++.TP ++.PD ++.B \-b \fIbang\fP ++Hash-bang line to start the archive (e.g. #!/usr/bin/php). ++The hash mark itself '#!' and the newline character are optional. ++.TP ++.PD ++.B \-c \fIalgo\fP ++Compression algorithm (see ++.SM ++.B COMPRESSION ++) ++.TP ++.PD ++.B \-h \fIhash\fP ++Selects the \fIhash\fP algorithm (see ++.SM ++.B HASH ++) ++.TP ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-l \fIlevel\fP ++Number of preceding subdirectories to strip from file entries ++.TP ++.PD ++.B \-p \fIloader\fP ++Location of PHP_Archive class file (pear list-files ++PHP_Archive).You can use '0' or '1' to locate it ++automatically using the mentioned pear command. When ++using '0' the command does not error out when the class ++file cannot be located. This switch also adds some code ++around the stub so that class PHP_Archive gets ++registered as phar:// stream wrapper if necessary. And ++finally this switch will add the file phar.inc from ++this package and load it to ensure class Phar is ++present. ++.TP ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++.TP ++.PD ++.B \-y \fIkey\fP ++Private \fIkey\fP for OpenSSL signing. ++ ++.SH sign command ++Set signature hash algorithm. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.TP ++.PD ++.B \-h \fIhash\fP ++Selects the \fIhash\fP algorithm (see ++.SM ++.B HASH ++) ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-y \fIkey\fP ++Private \fIkey\fP for OpenSSL signing. ++ ++.SH stub-get command ++Get the stub of a PHAR file. If no output file is specified as stub then stdout ++is being used. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++ ++.SH stub-set command ++Set the stub of a PHAR file. If no input file is specified as stub then stdin ++is being used. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-b \fIbang\fP ++Hash-bang line to start the archive (e.g. #!/usr/bin/php). ++The hash mark itself '#!' and the newline character are optional. ++.TP ++.PD ++.B \-p \fIloader\fP ++Location of PHP_Archive class file (pear list-files ++PHP_Archive).You can use '0' or '1' to locate it ++automatically using the mentioned pear command. When ++using '0' the command does not error out when the class ++file cannot be located. This switch also adds some code ++around the stub so that class PHP_Archive gets ++registered as phar:// stream wrapper if necessary. And ++finally this switch will add the file phar.inc from ++this package and load it to ensure class Phar is ++present. ++.TP ++.PD ++.B \-s \fIstub\fP ++Select the \fIstub\fP file. ++ ++ ++.SH tree command ++Get a directory tree for a PHAR archive. ++.P ++Required arguments: ++.TP 15 ++.PD ++.B -f \fIfile\fP ++Specifies the phar \fIfile\fP to work on. ++.P ++Optional arguments: ++.TP 15 ++.PD ++.B \-i \fIregex\fP ++Specifies a regular expression for input files. ++.TP ++.PD ++.B \-x \fIregex\fP ++Regular expression for input files to exclude. ++ ++.SH version command ++Get information about the PHAR environment and the tool version. ++ ++ ++.SH COMPRESSION ++Algorithms: ++.TP 15 ++.PD ++.B 0 ++No compression ++.TP ++.PD ++.B none ++No compression ++.TP ++.PD ++.B auto ++Automatically select compression algorithm ++.TP ++.PD ++.B gz ++GZip compression ++.TP ++.PD ++.B gzip ++GZip compression ++.TP ++.PD ++.B bz2 ++BZip2 compression ++.TP ++.PD ++.B bzip2 ++BZip2 compression ++ ++.SH HASH ++Algorithms: ++.TP 15 ++.PD ++.TP ++.PD ++.B md5 ++MD5 ++.TP ++.PD ++.B sha1 ++SHA1 ++.TP ++.PD ++.B sha256 ++SHA256 ++.TP ++.PD ++.B sha512 ++SHA512 ++.TP ++.PD ++.B openssl ++OpenSSL ++ ++.SH SEE ALSO ++For a more or less complete description of PHAR look here: ++.PD 0 ++.P ++.B http://php.net/phar ++.PD 1 ++.P ++.SH BUGS ++You can view the list of known bugs or report any new bug you ++found at: ++.PD 0 ++.P ++.B http://bugs.php.net ++.PD 1 ++.SH AUTHORS ++The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski. ++.P ++Work for the PHP archive was done by Gregory Beaver, Marcus Boerger. ++.P ++A List of active developers can be found here: ++.PD 0 ++.P ++.B http://www.php.net/credits.php ++.PD 1 ++.P ++And last but not least PHP was developed with the help of a huge amount of ++contributors all around the world. ++.SH VERSION INFORMATION ++This manpage describes \fBphar\fP, version @PHP_VERSION@. ++.SH COPYRIGHT ++Copyright \(co 1997\-2013 The PHP Group ++.LP ++This source file is subject to version 3.01 of the PHP license, ++that is bundled with this package in the file LICENSE, and is ++available through the world-wide-web at the following url: ++.PD 0 ++.P ++.B http://www.php.net/license/3_01.txt ++.PD 1 ++.P ++If you did not receive a copy of the PHP license and are unable to ++obtain it through the world-wide-web, please send a note to ++.B license@php.net ++so we can mail you a copy immediately. +diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in +new file mode 100644 +index 0000000..b5eecbf +--- /dev/null ++++ b/ext/phar/phar.phar.1.in +@@ -0,0 +1 @@ ++.so man1/phar.1 +-- +1.7.11.5 + +From 67817a199ca4c8bcff163cb005287c0087db6bf3 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 2 Jul 2013 12:19:09 +0200 +Subject: [PATCH] fix typo in php man page + +--- + sapi/cli/php.1.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in +index 6f0266d..749baa8 100644 +--- a/sapi/cli/php.1.in ++++ b/sapi/cli/php.1.in +@@ -2,7 +2,7 @@ + .SH NAME + php \- PHP Command Line Interface 'CLI' + .P +-php-cgi \- PHP Command Gateway Interface 'CGI' ++php-cgi \- PHP Common Gateway Interface 'CGI' command + .SH SYNOPSIS + .B php + [options] [ +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.16-pdopgsql.patch b/SOURCES/php-5.4.16-pdopgsql.patch new file mode 100644 index 0000000..eff1edb --- /dev/null +++ b/SOURCES/php-5.4.16-pdopgsql.patch @@ -0,0 +1,33 @@ +From 1c623e3b07128e78362911ff5754e7eee57fa8bb Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 31 May 2013 08:39:32 +0200 +Subject: [PATCH] Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) + +There is a lot of call such as: + pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed"); +Where the 3rd paramater is a error message string where a sqlstate (5 chars) +is expected. This cause a segfault in copy_from.phpt and copy_to.phpt. + +This is only a sanity check to avoid buffer overflow, but obviously this +calls need to be fixed (using NULL or a correct sqlstate). +--- + NEWS | 3 +++ + ext/pdo_pgsql/pgsql_driver.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c +index 645fd36..55f4418 100644 +--- a/ext/pdo_pgsql/pgsql_driver.c ++++ b/ext/pdo_pgsql/pgsql_driver.c +@@ -76,7 +76,7 @@ int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char * + einfo->errmsg = NULL; + } + +- if (sqlstate == NULL) { ++ if (sqlstate == NULL || strlen(sqlstate) >= sizeof(pdo_error_type)) { + strcpy(*pdo_err, "HY000"); + } + else { +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.16-pdotests.patch b/SOURCES/php-5.4.16-pdotests.patch new file mode 100644 index 0000000..7371798 --- /dev/null +++ b/SOURCES/php-5.4.16-pdotests.patch @@ -0,0 +1,34 @@ +From c08e1d2be948d63f7a9309344a0ed4092ac8dace Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Sun, 24 Mar 2013 17:52:16 +0100 +Subject: [PATCH] Fix PDO::inTransaction() test for pgsql + +inTransaction() nowadays casts the in_transaction result to boolean. +I'm not sure whether the INERROR state should result in true or false. +For now I went with the result that we actually get. +--- + ext/pdo_pgsql/tests/is_in_transaction.phpt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ext/pdo_pgsql/tests/is_in_transaction.phpt b/ext/pdo_pgsql/tests/is_in_transaction.phpt +index 99ff561..72da4f4 100644 +--- a/ext/pdo_pgsql/tests/is_in_transaction.phpt ++++ b/ext/pdo_pgsql/tests/is_in_transaction.phpt +@@ -57,10 +57,10 @@ var_dump($db->inTransaction()); + ?> + --EXPECT-- + Test PDO::PGSQL_TRANSACTION_INTRANS +-int(2) ++bool(true) + Test PDO::PGSQL_TRANSACTION_IDLE +-int(0) ++bool(false) + Test PDO::PGSQL_TRANSACTION_INERROR +-int(3) ++bool(true) + Test PDO::PGSQL_TRANSACTION_IDLE +-int(0) ++bool(false) +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.17-CVE-2013-4013.patch b/SOURCES/php-5.4.17-CVE-2013-4013.patch new file mode 100644 index 0000000..dfa2c86 --- /dev/null +++ b/SOURCES/php-5.4.17-CVE-2013-4013.patch @@ -0,0 +1,181 @@ +From 7d163e8a0880ae8af2dd869071393e5dc07ef271 Mon Sep 17 00:00:00 2001 +From: Rob Richards +Date: Sat, 6 Jul 2013 07:53:07 -0400 +Subject: [PATCH] truncate results at depth of 255 to prevent corruption + +--- + ext/xml/xml.c | 90 +++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 50 insertions(+), 40 deletions(-) + +diff --git a/ext/xml/xml.c b/ext/xml/xml.c +index 1f0480b..9f0bc30 100644 +--- a/ext/xml/xml.c ++++ b/ext/xml/xml.c +@@ -428,7 +428,7 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) + } + if (parser->ltags) { + int inx; +- for (inx = 0; inx < parser->level; inx++) ++ for (inx = 0; ((inx < parser->level) && (inx < XML_MAXLEVEL)); inx++) + efree(parser->ltags[ inx ]); + efree(parser->ltags); + } +@@ -805,45 +805,50 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch + } + + if (parser->data) { +- zval *tag, *atr; +- int atcnt = 0; ++ if (parser->level <= XML_MAXLEVEL) { ++ zval *tag, *atr; ++ int atcnt = 0; + +- MAKE_STD_ZVAL(tag); +- MAKE_STD_ZVAL(atr); ++ MAKE_STD_ZVAL(tag); ++ MAKE_STD_ZVAL(atr); + +- array_init(tag); +- array_init(atr); ++ array_init(tag); ++ array_init(atr); + +- _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); ++ _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); + +- add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ +- add_assoc_string(tag,"type","open",1); +- add_assoc_long(tag,"level",parser->level); ++ add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ ++ add_assoc_string(tag,"type","open",1); ++ add_assoc_long(tag,"level",parser->level); + +- parser->ltags[parser->level-1] = estrdup(tag_name); +- parser->lastwasopen = 1; ++ parser->ltags[parser->level-1] = estrdup(tag_name); ++ parser->lastwasopen = 1; + +- attributes = (const XML_Char **) attrs; ++ attributes = (const XML_Char **) attrs; + +- while (attributes && *attributes) { +- att = _xml_decode_tag(parser, attributes[0]); +- val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); +- +- add_assoc_stringl(atr,att,val,val_len,0); ++ while (attributes && *attributes) { ++ att = _xml_decode_tag(parser, attributes[0]); ++ val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); + +- atcnt++; +- attributes += 2; ++ add_assoc_stringl(atr,att,val,val_len,0); + +- efree(att); +- } ++ atcnt++; ++ attributes += 2; + +- if (atcnt) { +- zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); +- } else { +- zval_ptr_dtor(&atr); +- } ++ efree(att); ++ } ++ ++ if (atcnt) { ++ zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); ++ } else { ++ zval_ptr_dtor(&atr); ++ } + +- zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag); ++ zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag); ++ } else if (parser->level == (XML_MAXLEVEL + 1)) { ++ TSRMLS_FETCH(); ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); ++ } + } + + efree(tag_name); +@@ -895,7 +900,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) + + efree(tag_name); + +- if (parser->ltags) { ++ if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) { + efree(parser->ltags[parser->level-1]); + } + +@@ -979,18 +984,23 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) + } + } + +- MAKE_STD_ZVAL(tag); +- +- array_init(tag); +- +- _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); ++ if (parser->level <= XML_MAXLEVEL) { ++ MAKE_STD_ZVAL(tag); + +- add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1); +- add_assoc_string(tag,"value",decoded_value,0); +- add_assoc_string(tag,"type","cdata",1); +- add_assoc_long(tag,"level",parser->level); ++ array_init(tag); + +- zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); ++ _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); ++ ++ add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1); ++ add_assoc_string(tag,"value",decoded_value,0); ++ add_assoc_string(tag,"type","cdata",1); ++ add_assoc_long(tag,"level",parser->level); ++ ++ zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); ++ } else if (parser->level == (XML_MAXLEVEL + 1)) { ++ TSRMLS_FETCH(); ++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); ++ } + } + } else { + efree(decoded_value); +-- +1.7.11.5 + +From 710eee5555bc5c95692bd3c84f5d2b5d687349b6 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Johannes=20Schl=C3=BCter?= +Date: Wed, 10 Jul 2013 19:35:18 +0200 +Subject: [PATCH] add test for bug #65236 + +--- + ext/xml/tests/bug65236.phpt | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + create mode 100644 ext/xml/tests/bug65236.phpt + +diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt +new file mode 100644 +index 0000000..67b26d6 +--- /dev/null ++++ b/ext/xml/tests/bug65236.phpt +@@ -0,0 +1,15 @@ ++--TEST-- ++Bug #65236 (heap corruption in xml parser) ++--SKIPIF-- ++ ++--FILE-- ++", 1000), $a); ++ ++echo "Done\n"; ++?> ++--EXPECTF-- ++Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d ++Done +-- +1.7.11.5 + diff --git a/SOURCES/php-5.4.7-libdb.patch b/SOURCES/php-5.4.7-libdb.patch new file mode 100644 index 0000000..0b1e305 --- /dev/null +++ b/SOURCES/php-5.4.7-libdb.patch @@ -0,0 +1,62 @@ +--- php-5.4.7/ext/dba/config.m4.orig 2012-09-20 12:23:00.548322754 +0200 ++++ php-5.4.7/ext/dba/config.m4 2012-09-20 12:28:07.656380829 +0200 +@@ -312,57 +312,13 @@ + 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.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.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 --git a/SOURCES/php-5.4.7-odbctimer.patch b/SOURCES/php-5.4.7-odbctimer.patch new file mode 100644 index 0000000..88c4da4 --- /dev/null +++ b/SOURCES/php-5.4.7-odbctimer.patch @@ -0,0 +1,58 @@ +From 657494235eafe048e9fa6a19dcdb3c73a0cbe6ec Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 27 Sep 2012 13:45:32 +0200 +Subject: [PATCH] Fixed bug #63171, script hangs if odbc call during timeout + +--- + ext/odbc/php_odbc.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c +index 52d46b2..2169e65 100644 +--- a/ext/odbc/php_odbc.c ++++ b/ext/odbc/php_odbc.c +@@ -431,7 +431,8 @@ static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) + efree(res->values); + res->values = NULL; + } +- if (res->stmt) { ++ /* If aborted via timer expiration, don't try to call any unixODBC function */ ++ if (res->stmt && !(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { + #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) + SQLTransact(res->conn_ptr->henv, res->conn_ptr->hdbc, + (SQLUSMALLINT) SQL_COMMIT); +@@ -484,9 +485,12 @@ static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC) + } + } + +- safe_odbc_disconnect(conn->hdbc); +- SQLFreeConnect(conn->hdbc); +- SQLFreeEnv(conn->henv); ++ /* If aborted via timer expiration, don't try to call any unixODBC function */ ++ if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { ++ safe_odbc_disconnect(conn->hdbc); ++ SQLFreeConnect(conn->hdbc); ++ SQLFreeEnv(conn->henv); ++ } + efree(conn); + ODBCG(num_links)--; + } +@@ -512,9 +516,12 @@ static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC) + } + } + +- safe_odbc_disconnect(conn->hdbc); +- SQLFreeConnect(conn->hdbc); +- SQLFreeEnv(conn->henv); ++ /* If aborted via timer expiration, don't try to call any unixODBC function */ ++ if (!(PG(connection_status) & PHP_CONNECTION_TIMEOUT)) { ++ safe_odbc_disconnect(conn->hdbc); ++ SQLFreeConnect(conn->hdbc); ++ SQLFreeEnv(conn->henv); ++ } + free(conn); + + ODBCG(num_links)--; +-- +1.7.10 + diff --git a/SOURCES/php-5.4.8-ldap_r.patch b/SOURCES/php-5.4.8-ldap_r.patch new file mode 100644 index 0000000..6d6924f --- /dev/null +++ b/SOURCES/php-5.4.8-ldap_r.patch @@ -0,0 +1,17 @@ + +Use -lldap_r by default. + +--- php-5.4.8/ext/ldap/config.m4.ldap_r ++++ php-5.4.8/ext/ldap/config.m4 +@@ -95,7 +95,10 @@ if test "$PHP_LDAP" != "no"; then + LDAP_PTHREAD= + fi + +- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/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; then + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + diff --git a/SOURCES/php-5.4.9-fixheader.patch b/SOURCES/php-5.4.9-fixheader.patch new file mode 100644 index 0000000..f4e7db5 --- /dev/null +++ b/SOURCES/php-5.4.9-fixheader.patch @@ -0,0 +1,23 @@ + +Make generated php_config.h constant across rebuilds. + +--- php-5.4.9/configure.in.fixheader ++++ php-5.4.9/configure.in +@@ -1258,7 +1258,7 @@ fi + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" + EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" + +-PHP_BUILD_DATE=`date '+%Y-%m-%d'` ++PHP_BUILD_DATE=`date '+%Y-%m-%d' -r $srcdir/NEWS` + AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) + + case $host_alias in +@@ -1269,7 +1269,7 @@ case $host_alias in + AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) + ;; + *) +- 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]) diff --git a/SOURCES/php-5.4.9-phpinfo.patch b/SOURCES/php-5.4.9-phpinfo.patch new file mode 100644 index 0000000..b52a2f8 --- /dev/null +++ b/SOURCES/php-5.4.9-phpinfo.patch @@ -0,0 +1,27 @@ + +Drop "Configure Command" from phpinfo as it doesn't +provide any useful information. +The available extensions are not related to this command. + +--- php-5.4.9/ext/standard/info.c.orig 2012-12-11 10:43:02.450578276 +0100 ++++ php-5.4.9/ext/standard/info.c 2012-12-11 10:44:12.530820821 +0100 +@@ -704,9 +704,6 @@ + #ifdef ARCHITECTURE + php_info_print_table_row(2, "Architecture", ARCHITECTURE); + #endif +-#ifdef CONFIGURE_COMMAND +- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); +-#endif + + if (sapi_module.pretty_name) { + php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); +--- php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt.orig 2012-12-11 11:07:26.959156091 +0100 ++++ php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt 2012-12-11 11:07:30.899170970 +0100 +@@ -20,7 +20,6 @@ + + System => %s + Build Date => %s%a +-Configure Command => %s + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s diff --git a/SOURCES/php-fpm-www.conf b/SOURCES/php-fpm-www.conf new file mode 100644 index 0000000..9cdbb4f --- /dev/null +++ b/SOURCES/php-fpm-www.conf @@ -0,0 +1,226 @@ +; Start a new pool named 'www'. +[www] + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: -1 +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +; RPM: apache Choosed to be able to access some dir as httpd +user = apache +; RPM: Keep a group allowed to write in log dir. +group = apache + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 5 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 35 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +slowlog = /var/log/php-fpm/www-slow.log + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. This value must be an absolute path. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Default Value: no +;catch_workers_output = yes + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +php_admin_value[error_log] = /var/log/php-fpm/www-error.log +php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 128M + +; Set session path to a directory owned by process user +php_value[session.save_handler] = files +php_value[session.save_path] = /var/lib/php/session + diff --git a/SOURCES/php-fpm.conf b/SOURCES/php-fpm.conf new file mode 100644 index 0000000..c9760eb --- /dev/null +++ b/SOURCES/php-fpm.conf @@ -0,0 +1,60 @@ +;;;;;;;;;;;;;;;;;;;;; +; FPM Configuration ; +;;;;;;;;;;;;;;;;;;;;; + +; All relative paths in this configuration file are relative to PHP's install +; prefix. + +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +include=/etc/php-fpm.d/*.conf + +;;;;;;;;;;;;;;;;;; +; Global Options ; +;;;;;;;;;;;;;;;;;; + +[global] +; Pid file +; Default Value: none +pid = /run/php-fpm/php-fpm.pid + +; Error log file +; Default Value: /var/log/php-fpm.log +error_log = /var/log/php-fpm/error.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +;log_level = notice + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +;emergency_restart_threshold = 0 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;emergency_restart_interval = 0 + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;process_control_timeout = 0 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +daemonize = no + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; See /etc/php-fpm.d/*.conf + diff --git a/SOURCES/php-fpm.logrotate b/SOURCES/php-fpm.logrotate new file mode 100644 index 0000000..25f9feb --- /dev/null +++ b/SOURCES/php-fpm.logrotate @@ -0,0 +1,9 @@ +/var/log/php-fpm/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/SOURCES/php-fpm.service b/SOURCES/php-fpm.service new file mode 100644 index 0000000..ea09910 --- /dev/null +++ b/SOURCES/php-fpm.service @@ -0,0 +1,15 @@ +[Unit] +Description=The PHP FastCGI Process Manager +After=syslog.target network.target + +[Service] +Type=notify +PIDFile=/run/php-fpm/php-fpm.pid +EnvironmentFile=/etc/sysconfig/php-fpm +ExecStart=/usr/sbin/php-fpm --nodaemonize +ExecReload=/bin/kill -USR2 $MAINPID +PrivateTmp=true + +[Install] +WantedBy=multi-user.target + diff --git a/SOURCES/php-fpm.sysconfig b/SOURCES/php-fpm.sysconfig new file mode 100644 index 0000000..72096da --- /dev/null +++ b/SOURCES/php-fpm.sysconfig @@ -0,0 +1,2 @@ +# Additional environment file for php-fpm + diff --git a/SOURCES/php.conf b/SOURCES/php.conf new file mode 100644 index 0000000..64eb5fd --- /dev/null +++ b/SOURCES/php.conf @@ -0,0 +1,32 @@ +# +# Cause the PHP interpreter to handle files with a .php extension. +# + + SetHandler application/x-httpd-php + + +# +# Allow php to handle Multiviews +# +AddType text/html .php + +# +# Add index.php to the list of files that will be served as directory +# indexes. +# +DirectoryIndex index.php + +# +# Uncomment the following lines to allow PHP to pretty-print .phps +# files as PHP source code: +# +# +# SetHandler application/x-httpd-php-source +# + +# +# Apache specific PHP configuration options +# those can be override in each configured vhost +# +php_value session.save_handler "files" +php_value session.save_path "/var/lib/php/session" diff --git a/SOURCES/php.ini b/SOURCES/php.ini new file mode 100644 index 0000000..30fff27 --- /dev/null +++ b/SOURCES/php.ini @@ -0,0 +1,1797 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; PHP's initialization file, generally called php.ini, is responsible for +; configuring many of the aspects of PHP's behavior. + +; PHP attempts to find and load this configuration from a number of locations. +; The following is a summary of its search order: +; 1. SAPI module specific location. +; 2. The PHPRC environment variable. (As of PHP 5.2.0) +; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 4. Current working directory (except CLI) +; 5. The web server's directory (for SAPI modules), or directory of PHP +; (otherwise in Windows) +; 6. The directory from the --with-config-file-path compile time option, or the +; Windows directory (C:\windows or C:\winnt) +; See the PHP docs for more specific information. +; http://php.net/configuration.file + +; The syntax of the file is extremely simple. Whitespace and lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. + +; Directives following the section heading [PATH=/www/mysite] only +; apply to PHP files in the /www/mysite directory. Directives +; following the section heading [HOST=www.example.com] only apply to +; PHP files served from www.example.com. Directives set in these +; special sections cannot be overridden by user-defined INI files or +; at runtime. Currently, [PATH=] and [HOST=] sections only work under +; CGI/FastCGI. +; http://php.net/ini.sections + +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; Directives are variables used to configure PHP or PHP extensions. +; There is no name validation. If PHP can't find an expected +; directive because it is not set or is mistyped, a default value will be used. + +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a +; previously set variable or directive (e.g. ${foo}) + +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; ^ bitwise XOR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT + +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. + +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: + +; foo = ; sets foo to an empty string +; foo = None ; sets foo to an empty string +; foo = "None" ; sets foo to the string 'None' + +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; PHP comes packaged with two INI files. One that is recommended to be used +; in production environments and one that is recommended to be used in +; development environments. + +; php.ini-production contains settings which hold security, performance and +; best practices at its core. But please be aware, these settings may break +; compatibility with older or less security conscience applications. We +; recommending using the production ini in production and testing environments. + +; php.ini-development is very similar to its production variant, except it's +; much more verbose when it comes to errors. We recommending using the +; development version only in development environments as errors shown to +; application users can inadvertently leak otherwise secure information. + +;;;;;;;;;;;;;;;;;;; +; Quick Reference ; +;;;;;;;;;;;;;;;;;;; +; The following are all the settings which are different in either the production +; or development versions of the INIs with respect to PHP's default behavior. +; Please see the actual settings later in the document for more details as to why +; we recommend these changes in PHP's behavior. + +; display_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; display_startup_errors +; Default Value: Off +; Development Value: On +; Production Value: Off + +; error_reporting +; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT + +; html_errors +; Default Value: On +; Development Value: On +; Production value: On + +; log_errors +; Default Value: Off +; Development Value: On +; Production Value: On + +; max_input_time +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) + +; output_buffering +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 + +; register_argc_argv +; Default Value: On +; Development Value: Off +; Production Value: Off + +; request_order +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" + +; session.bug_compat_42 +; Default Value: On +; Development Value: On +; Production Value: Off + +; session.bug_compat_warn +; Default Value: On +; Development Value: On +; Production Value: Off + +; session.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.hash_bits_per_character +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 + +; short_open_tag +; Default Value: On +; Development Value: Off +; Production Value: Off + +; track_errors +; Default Value: Off +; Development Value: On +; Production Value: Off + +; url_rewriter.tags +; Default Value: "a=href,area=href,frame=src,form=,fieldset=" +; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry" +; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry" + +; variables_order +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS" + +;;;;;;;;;;;;;;;;;;;; +; php.ini Options ; +;;;;;;;;;;;;;;;;;;;; +; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" +;user_ini.filename = ".user.ini" + +; To disable this feature set this option to empty value +;user_ini.filename = + +; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) +;user_ini.cache_ttl = 300 + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +; http://php.net/engine +engine = On + +; This directive determines whether or not PHP will recognize code between +; tags as PHP source which should be processed as such. It's been +; recommended for several years that you not use the short tag "short cut" and +; instead to use the full tag combination. With the wide spread use +; of XML and use of these tags by other languages, the server can become easily +; confused and end up parsing the wrong code in the wrong context. But because +; this short cut has been a feature for such a long time, it's currently still +; supported for backwards compatibility, but we recommend you don't use them. +; Default Value: On +; Development Value: Off +; Production Value: Off +; http://php.net/short-open-tag +short_open_tag = Off + +; Allow ASP-style <% %> tags. +; http://php.net/asp-tags +asp_tags = Off + +; The number of significant digits displayed in floating point numbers. +; http://php.net/precision +precision = 14 + +; Output buffering is a mechanism for controlling how much output data +; (excluding headers and cookies) PHP should keep internally before pushing that +; data to the client. If your application's output exceeds this setting, PHP +; will send that data in chunks of roughly the size you specify. +; Turning on this setting and managing its maximum buffer size can yield some +; interesting side-effects depending on your application and web server. +; You may be able to send headers and cookies after you've already sent output +; through print or echo. You also may see performance benefits if your server is +; emitting less packets due to buffered output versus PHP streaming the output +; as it gets it. On production servers, 4096 bytes is a good setting for performance +; reasons. +; Note: Output buffering can also be controlled via Output Buffering Control +; functions. +; Possible Values: +; On = Enabled and buffer is unlimited. (Use with caution) +; Off = Disabled +; Integer = Enables the buffer and sets its maximum size in bytes. +; Note: This directive is hardcoded to Off for the CLI SAPI +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 +; http://php.net/output-buffering +output_buffering = 4096 + +; You can redirect all of the output of your scripts to a function. For +; example, if you set output_handler to "mb_output_handler", character +; encoding will be transparently converted to the specified encoding. +; Setting any output handler automatically turns on output buffering. +; Note: People who wrote portable scripts should not depend on this ini +; directive. Instead, explicitly set the output handler using ob_start(). +; Using this ini directive may cause problems unless you know what script +; is doing. +; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" +; and you cannot use both "ob_gzhandler" and "zlib.output_compression". +; Note: output_handler must be empty if this is set 'On' !!!! +; Instead you must use zlib.output_handler. +; http://php.net/output-handler +;output_handler = + +; Transparent output compression using the zlib library +; Valid values for this option are 'off', 'on', or a specific buffer size +; to be used for compression (default is 4KB) +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better +; performance, enable output_buffering in addition. +; Note: You need to use zlib.output_handler instead of the standard +; output_handler, or otherwise the output will be corrupted. +; http://php.net/zlib.output-compression +zlib.output_compression = Off + +; http://php.net/zlib.output-compression-level +;zlib.output_compression_level = -1 + +; You cannot specify additional output handlers if zlib.output_compression +; is activated here. This setting does the same as output_handler but in +; a different order. +; http://php.net/zlib.output-handler +;zlib.output_handler = + +; Implicit flush tells PHP to tell the output layer to flush itself +; automatically after every output block. This is equivalent to calling the +; PHP function flush() after each and every call to print() or echo() and each +; and every HTML block. Turning this option on has serious performance +; implications and is generally recommended for debugging purposes only. +; http://php.net/implicit-flush +; Note: This directive is hardcoded to On for the CLI SAPI +implicit_flush = Off + +; The unserialize callback function will be called (with the undefined class' +; name as parameter), if the unserializer finds an undefined class +; which should be instantiated. A warning appears if the specified function is +; not defined, or if the function doesn't include/implement the missing class. +; So only set this entry, if you really want to implement such a +; callback-function. +unserialize_callback_func = + +; When floats & doubles are serialized store serialize_precision significant +; digits after the floating point. The default value ensures that when floats +; are decoded with unserialize, the data will remain the same. +serialize_precision = 17 + +; open_basedir, if set, limits all file operations to the defined directory +; and below. This directive makes most sense if used in a per-directory +; or per-virtualhost web server configuration file. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +; http://php.net/open-basedir +;open_basedir = + +; This directive allows you to disable certain functions for security reasons. +; It receives a comma-delimited list of function names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +; http://php.net/disable-functions +disable_functions = + +; This directive allows you to disable certain classes for security reasons. +; It receives a comma-delimited list of class names. This directive is +; *NOT* affected by whether Safe Mode is turned On or Off. +; http://php.net/disable-classes +disable_classes = + +; Colors for Syntax Highlighting mode. Anything that's acceptable in +; would work. +; http://php.net/syntax-highlighting +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long requests, which may end up +; being interrupted by the user or a browser timing out. PHP's default behavior +; is to disable this feature. +; http://php.net/ignore-user-abort +;ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; http://php.net/realpath-cache-size +;realpath_cache_size = 16k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; http://php.net/realpath-cache-ttl +;realpath_cache_ttl = 120 + +; Enables or disables the circular reference collector. +; http://php.net/zend.enable-gc +zend.enable_gc = On + +; If enabled, scripts may be written in encodings that are incompatible with +; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such +; encodings. To use this feature, mbstring extension must be enabled. +; Default: Off +;zend.multibyte = Off + +; Allows to set the default encoding for the scripts. This value will be used +; unless "declare(encoding=...)" directive appears at the top of the script. +; Only affects if zend.multibyte is set. +; Default: "" +;zend.script_encoding = + +;;;;;;;;;;;;;;;;; +; Miscellaneous ; +;;;;;;;;;;;;;;;;; + +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +; http://php.net/expose-php +expose_php = On + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +; Maximum execution time of each script, in seconds +; http://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 30 + +; Maximum amount of time each script may spend parsing request data. It's a good +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; http://php.net/max-input-time +max_input_time = 60 + +; Maximum input variable nesting level +; http://php.net/max-input-nesting-level +;max_input_nesting_level = 64 + +; How many GET/POST/COOKIE input variables may be accepted +; max_input_vars = 1000 + +; Maximum amount of memory a script may consume (128MB) +; http://php.net/memory-limit +memory_limit = 128M + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; This directive informs PHP of which errors, warnings and notices you would like +; it to take action for. The recommended way of setting values for this +; directive is through the use of the error level constants and bitwise +; operators. The error level constants are below here for convenience as well as +; some common settings and their meanings. +; By default, PHP is set to take action on all errors, notices and warnings EXCEPT +; those related to E_NOTICE and E_STRICT, which together cover best practices and +; recommended coding standards in PHP. For performance reasons, this is the +; recommend error reporting setting. Your production server shouldn't be wasting +; resources complaining about best practices and coding standards. That's what +; development servers and development settings are for. +; Note: The php.ini-development file has this setting as E_ALL. This +; means it pretty much reports everything which is exactly what you want during +; development and early testing. +; +; Error Level Constants: +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it's automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; E_DEPRECATED - warn about code that will not work in future versions +; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings +; +; Common Values: +; E_ALL (Show all errors, warnings and notices including coding standards.) +; E_ALL & ~E_NOTICE (Show all errors, except for notices) +; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) +; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) +; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT +; http://php.net/error-reporting +error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT + +; This directive controls whether or not and where PHP will output errors, +; notices and warnings too. Error output is very useful during development, but +; it could be very dangerous in production environments. Depending on the code +; which is triggering the error, sensitive information could potentially leak +; out of your application such as database usernames and passwords or worse. +; It's recommended that errors be logged on production servers rather than +; having the errors sent to STDOUT. +; Possible Values: +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout = Display errors to STDOUT +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/display-errors +display_errors = Off + +; The display of errors which occur during PHP's startup sequence are handled +; separately from display_errors. PHP's default behavior is to suppress those +; errors from clients. Turning the display of startup errors on can be useful in +; debugging configuration problems. But, it's strongly recommended that you +; leave this setting off on production servers. +; Default Value: Off +; Development Value: On +; Production Value: Off +; http://php.net/display-startup-errors +display_startup_errors = Off + +; Besides displaying errors, PHP can also log errors to locations such as a +; server-specific log, STDERR, or a location specified by the error_log +; directive found below. While errors should not be displayed on productions +; servers they should still be monitored and logging is a great way to do that. +; Default Value: Off +; Development Value: On +; Production Value: On +; http://php.net/log-errors +log_errors = On + +; Set maximum length of log_errors. In error_log information about the source is +; added. The default is 1024 and 0 allows to not apply any maximum length at all. +; http://php.net/log-errors-max-len +log_errors_max_len = 1024 + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line unless ignore_repeated_source is set true. +; http://php.net/ignore-repeated-errors +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +; http://php.net/ignore-repeated-source +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This has only effect in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +; http://php.net/report-memleaks +report_memleaks = On + +; This setting is on by default. +;report_zend_debug = 0 + +; Store the last error/warning message in $php_errormsg (boolean). Setting this value +; to On can assist in debugging and is appropriate for development servers. It should +; however be disabled on production servers. +; Default Value: Off +; Development Value: On +; Production Value: Off +; http://php.net/track-errors +track_errors = Off + +; Turn off normal error reporting and emit XML-RPC error XML +; http://php.net/xmlrpc-errors +;xmlrpc_errors = 0 + +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + +; When PHP displays or logs an error, it has the capability of formatting the +; error message as HTML for easier reading. This directive controls whether +; the error message is formatted as HTML or not. +; Note: This directive is hardcoded to Off for the CLI SAPI +; Default Value: On +; Development Value: On +; Production value: On +; http://php.net/html-errors +html_errors = On + +; If html_errors is set to On *and* docref_root is not empty, then PHP +; produces clickable error messages that direct to a page describing the error +; or function causing the error in detail. +; You can download a copy of the PHP manual from http://php.net/docs +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. PHP's default behavior is to leave these settings empty, in which +; case no links to documentation are generated. +; Note: Never use this feature for production boxes. +; http://php.net/docref-root +; Examples +;docref_root = "/phpmanual/" + +; http://php.net/docref-ext +;docref_ext = .html + +; String to output before an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-prepend-string +; Example: +;error_prepend_string = "" + +; String to output after an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-append-string +; Example: +;error_append_string = "" + +; Log errors to specified file. PHP's default behavior is to leave this value +; empty. +; http://php.net/error-log +; Example: +;error_log = php_errors.log +; Log errors to syslog (Event Log on NT, not valid in Windows 95). +;error_log = syslog + +;windows.show_crt_warning +; Default value: 0 +; Development value: 0 +; Production value: 0 + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; + +; The separator used in PHP generated URLs to separate arguments. +; PHP's default setting is "&". +; http://php.net/arg-separator.output +; Example: +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; PHP's default setting is "&". +; NOTE: Every character in this directive is considered as separator! +; http://php.net/arg-separator.input +; Example: +;arg_separator.input = ";&" + +; This directive determines which super global arrays are registered when PHP +; starts up. G,P,C,E & S are abbreviations for the following respective super +; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty +; paid for the registration of these arrays and because ENV is not as commonly +; used as the others, ENV is not recommended on productions servers. You +; can still get access to the environment variables through getenv() should you +; need to. +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS"; +; http://php.net/variables-order +variables_order = "GPCS" + +; This directive determines which super global data (G,P,C,E & S) should +; be registered into the super global array REQUEST. If so, it also determines +; the order in which that data is registered. The values for this directive are +; specified in the same manner as the variables_order directive, EXCEPT one. +; Leaving this value empty will cause PHP to use the value set in the +; variables_order directive. It does not mean it will leave the super globals +; array REQUEST empty. +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" +; http://php.net/request-order +request_order = "GP" + +; This directive determines whether PHP registers $argv & $argc each time it +; runs. $argv contains an array of all the arguments passed to PHP when a script +; is invoked. $argc contains an integer representing the number of arguments +; that were passed when the script was invoked. These arrays are extremely +; useful when running scripts from the command line. When this directive is +; enabled, registering these variables consumes CPU cycles and memory each time +; a script is executed. For performance reasons, this feature should be disabled +; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI +; Default Value: On +; Development Value: Off +; Production Value: Off +; http://php.net/register-argc-argv +register_argc_argv = Off + +; When enabled, the ENV, REQUEST and SERVER variables are created when they're +; first used (Just In Time) instead of when the script starts. If these +; variables are not used within a script, having this directive on will result +; in a performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any affect. +; http://php.net/auto-globals-jit +auto_globals_jit = On + +; Whether PHP will read the POST data. +; This option is enabled by default. +; Most likely, you won't want to disable this option globally. It causes $_POST +; and $_FILES to always be empty; the only way you will be able to read the +; POST data will be through the php://input stream wrapper. This can be useful +; to proxy requests or to process the POST data in a memory efficient fashion. +; http://php.net/enable-post-data-reading +;enable_post_data_reading = Off + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; http://php.net/post-max-size +post_max_size = 8M + +; Automatically add files before PHP document. +; http://php.net/auto-prepend-file +auto_prepend_file = + +; Automatically add files after PHP document. +; http://php.net/auto-append-file +auto_append_file = + +; By default, PHP will output a character encoding using +; the Content-type: header. To disable sending of the charset, simply +; set it to be empty. +; +; PHP's built-in default is text/html +; http://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to empty. +; http://php.net/default-charset +;default_charset = "UTF-8" + +; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is +; to disable this feature. If post reading is disabled through +; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated. +; http://php.net/always-populate-raw-post-data +;always_populate_raw_post_data = On + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" +; +; PHP's default setting for include_path is ".;/path/to/php/pear" +; http://php.net/include-path + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +; http://php.net/doc-root +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +; http://php.net/user-dir +user_dir = + +; Directory in which the loadable extensions (modules) reside. +; http://php.net/extension-dir +; extension_dir = "./" +; On windows: +; extension_dir = "ext" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +; http://php.net/enable-dl +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; http://php.net/cgi.force-redirect +;cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. PHP's default behavior is to disable this feature. +;cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; http://php.net/cgi.redirect-status-env +;cgi.redirect_status_env = + +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; http://php.net/cgi.fix-pathinfo +;cgi.fix_pathinfo=1 + +; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; http://php.net/fastcgi.impersonate +;fastcgi.impersonate = 1 + +; Disable logging through FastCGI connection. PHP's default behavior is to enable +; this feature. +;fastcgi.logging = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If it's set 0 PHP sends Status: header that +; is supported by Apache. When this option is set to 1 PHP will send +; RFC2616 compliant header. +; Default is zero. +; http://php.net/cgi.rfc2616-headers +;cgi.rfc2616_headers = 0 + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +; http://php.net/file-uploads +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +; http://php.net/upload-tmp-dir +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +; http://php.net/upload-max-filesize +upload_max_filesize = 2M + +; Maximum number of files that can be uploaded via a single request +max_file_uploads = 20 + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-fopen +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-include +allow_url_include = Off + +; Define the anonymous ftp password (your email address). PHP's default setting +; for this is empty. +; http://php.net/from +;from="john@doe.com" + +; Define the User-Agent string. PHP's default setting for this is empty. +; http://php.net/user-agent +;user_agent="PHP" + +; Default timeout for socket based streams (seconds) +; http://php.net/default-socket-timeout +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; http://php.net/auto-detect-line-endings +;auto_detect_line_endings = Off + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; + +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename.extension +; +; For example, on Windows: +; +; extension=msql.dll +; +; ... or under UNIX: +; +; extension=msql.so +; +; ... or with a path: +; +; extension=/path/to/extension/msql.so +; +; If you only provide the name of the extension, PHP will look for it in its +; default extension directory. + +;;;; +; Note: packaged extension modules are now loaded via the .ini files +; found in the directory /etc/php.d; these are loaded by default. +;;;; + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[CLI Server] +; Whether the CLI web server uses ANSI color coding in its terminal output. +cli_server.color = On + +[Date] +; Defines the default timezone used by the date functions +; http://php.net/date.timezone +;date.timezone = + +; http://php.net/date.default-latitude +;date.default_latitude = 31.7667 + +; http://php.net/date.default-longitude +;date.default_longitude = 35.2333 + +; http://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.583333 + +; http://php.net/date.sunset-zenith +;date.sunset_zenith = 90.583333 + +[filter] +; http://php.net/filter.default +;filter.default = unsafe_raw + +; http://php.net/filter.default-flags +;filter.default_flags = + +[iconv] +;iconv.input_encoding = ISO-8859-1 +;iconv.internal_encoding = ISO-8859-1 +;iconv.output_encoding = ISO-8859-1 + +[intl] +;intl.default_locale = +; This directive allows you to produce PHP errors when some error +; happens within intl functions. The value is the level of the error produced. +; Default is 0, which does not produce any errors. +;intl.error_level = E_WARNING + +[sqlite] +; http://php.net/sqlite.assoc-case +;sqlite.assoc_case = 0 + +[sqlite3] +;sqlite3.extension_dir = + +[Pcre] +;PCRE library backtracking limit. +; http://php.net/pcre.backtrack-limit +;pcre.backtrack_limit=100000 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). +; http://php.net/pcre.recursion-limit +;pcre.recursion_limit=100000 + +[Pdo] +; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +; http://php.net/pdo-odbc.connection-pooling +;pdo_odbc.connection_pooling=strict + +;pdo_odbc.db2_instance_name + +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + +[Phar] +; http://php.net/phar.readonly +;phar.readonly = On + +; http://php.net/phar.require-hash +;phar.require_hash = On + +;phar.cache_list = + +[mail function] +; For Win32 only. +; http://php.net/smtp +SMTP = localhost +; http://php.net/smtp-port +smtp_port = 25 + +; For Win32 only. +; http://php.net/sendmail-from +;sendmail_from = me@example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +; http://php.net/sendmail-path +sendmail_path = /usr/sbin/sendmail -t -i + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(), even in safe mode. +;mail.force_extra_parameters = + +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename +mail.add_x_header = On + +; The path to a log file that will log all mail() calls. Log entries include +; the full path of the script, line number, To address and headers. +;mail.log = + +[SQL] +; http://php.net/sql.safe-mode +sql.safe_mode = Off + +[ODBC] +; http://php.net/odbc.default-db +;odbc.default_db = Not yet implemented + +; http://php.net/odbc.default-user +;odbc.default_user = Not yet implemented + +; http://php.net/odbc.default-pw +;odbc.default_pw = Not yet implemented + +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + +; Allow or prevent persistent links. +; http://php.net/odbc.allow-persistent +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +; http://php.net/odbc.check-persistent +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/odbc.max-persistent +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; http://php.net/odbc.max-links +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +; http://php.net/odbc.defaultlrl +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of odbc.defaultlrl and odbc.defaultbinmode +; http://php.net/odbc.defaultbinmode +odbc.defaultbinmode = 1 + +;birdstep.max_links = -1 + +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = "%Y-%m-%d %H:%M:%S" + +; Default date format. +ibase.dateformat = "%Y-%m-%d" + +; Default time format. +ibase.timeformat = "%H:%M:%S" + +[MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysql.allow-persistent +mysql.allow_persistent = On + +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysql.max-persistent +mysql.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; http://php.net/mysql.max-links +mysql.max_links = -1 + +; Default port number for mysql_connect(). If unset, mysql_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; http://php.net/mysql.default-port +mysql.default_port = + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/mysql.default-socket +mysql.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysql.default-host +mysql.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysql.default-user +mysql.default_user = + +; Default password for mysql_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; http://php.net/mysql.default-password +mysql.default_password = + +; Maximum time (in seconds) for connect timeout. -1 means no limit +; http://php.net/mysql.connect-timeout +mysql.connect_timeout = 60 + +; Trace mode. When trace_mode is active (=On), warnings for table/index scans and +; SQL-Errors will be displayed. +; http://php.net/mysql.trace-mode +mysql.trace_mode = Off + +[MySQLi] + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + +; Maximum number of links. -1 means no limit. +; http://php.net/mysqli.max-links +mysqli.max_links = -1 + +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; http://php.net/mysqli.default-port +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/mysqli.default-socket +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-host +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-user +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; http://php.net/mysqli.default-pw +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +[mysqlnd] +; Enable / Disable collection of general statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = Off + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + +[OCI8] + +; Connection: Enables privileged connections using external +; credentials (OCI_SYSOPER, OCI_SYSDBA) +; http://php.net/oci8.privileged-connect +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +; http://php.net/oci8.max-persistent +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +; http://php.net/oci8.persistent-timeout +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +; http://php.net/oci8.ping-interval +;oci8.ping_interval = 60 + +; Connection: Set this to a user chosen connection class to be used +; for all pooled server requests with Oracle 11g Database Resident +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = + +; High Availability: Using On lets PHP receive Fast Application +; Notification (FAN) events generated when a database node fails. The +; database must also be configured to post FAN events. +;oci8.events = Off + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +; http://php.net/oci8.statement-cache-size +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +; http://php.net/oci8.default-prefetch +;oci8.default_prefetch = 100 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +; http://php.net/oci8.old-oci-close-semantics +;oci8.old_oci_close_semantics = Off + +[PostgreSQL] +; Allow or prevent persistent links. +; http://php.net/pgsql.allow-persistent +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +; http://php.net/pgsql.auto-reset-persistent +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/pgsql.max-persistent +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +; http://php.net/pgsql.max-links +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +; http://php.net/pgsql.ignore-notice +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Notice message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +; http://php.net/pgsql.log-notice +pgsql.log_notice = 0 + +[Sybase-CT] +; Allow or prevent persistent links. +; http://php.net/sybct.allow-persistent +sybct.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/sybct.max-persistent +sybct.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; http://php.net/sybct.max-links +sybct.max_links = -1 + +; Minimum server message severity to display. +; http://php.net/sybct.min-server-severity +sybct.min_server_severity = 10 + +; Minimum client message severity to display. +; http://php.net/sybct.min-client-severity +sybct.min_client_severity = 10 + +; Set per-context timeout +; http://php.net/sybct.timeout +;sybct.timeout= + +;sybct.packet_size + +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means "forever". +; Default: 0 +;sybct.deadlock_retry_count= + +[bcmath] +; Number of decimal digits for all bcmath functions. +; http://php.net/bcmath.scale +bcmath.scale = 0 + +[browscap] +; http://php.net/browscap +;browscap = extra/browscap.ini + +[Session] +; Handler used to store/retrieve data. +; http://php.net/session.save-handler +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; The path can be defined as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if you +; or your OS have problems with lots of files in one directory, and is +; a more efficient layout for servers that handle lots of sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +; http://php.net/session.save-path + +; RPM note : session directory must be owned by process owner +; for mod_php, see /etc/httpd/conf.d/php.conf +; for php-fpm, see /etc/php-fpm.d/*conf +;session.save_path = "/tmp" + +; Whether to use cookies. +; http://php.net/session.use-cookies +session.use_cookies = 1 + +; http://php.net/session.cookie-secure +;session.cookie_secure = + +; This option forces PHP to fetch and use a cookie for storing and maintaining +; the session id. We encourage this operation as it's very helpful in combating +; session hijacking when not specifying and managing your own session id. It is +; not the end all be all of session hijacking defense, but it's a good start. +; http://php.net/session.use-only-cookies +session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +; http://php.net/session.name +session.name = PHPSESSID + +; Initialize session on request startup. +; http://php.net/session.auto-start +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +; http://php.net/session.cookie-lifetime +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +; http://php.net/session.cookie-path +session.cookie_path = / + +; The domain for which the cookie is valid. +; http://php.net/session.cookie-domain +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. +; http://php.net/session.cookie-httponly +session.cookie_httponly = + +; Handler used to serialize data. php is the standard serializer of PHP. +; http://php.net/session.serialize-handler +session.serialize_handler = php + +; Defines the probability that the 'garbage collection' process is started +; on every session initialization. The probability is calculated by using +; gc_probability/gc_divisor. Where session.gc_probability is the numerator +; and gc_divisor is the denominator in the equation. Setting this value to 1 +; when the session.gc_divisor value is 100 will give you approximately a 1% chance +; the gc will run on any give request. +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.gc-probability +session.gc_probability = 1 + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using the following equation: +; gc_probability/gc_divisor. Where session.gc_probability is the numerator and +; session.gc_divisor is the denominator in the equation. Setting this value to 1 +; when the session.gc_divisor value is 100 will give you approximately a 1% chance +; the gc will run on any give request. Increasing this value to 1000 will give you +; a 0.1% chance the gc will run on any give request. For high volume production servers, +; this is a more efficient approach. +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 +; http://php.net/session.gc-divisor +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +; http://php.net/session.gc-maxlifetime +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; find /path/to/sessions -cmin +24 | xargs rm + +; PHP 4.2 and less have an undocumented feature/bug that allows you to +; to initialize a session variable in the global scope. +; PHP 4.3 and later will warn you, if this feature is used. +; You can disable the feature and the warning separately. At this time, +; the warning is only displayed, if bug_compat_42 is enabled. This feature +; introduces some serious security problems if not handled correctly. It's +; recommended that you do not use this feature on production servers. But you +; should enable this on development servers and enable the warning as well. If you +; do not enable the feature on development servers, you won't be warned when it's +; used and debugging errors caused by this can be difficult to track down. +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/session.bug-compat-42 +session.bug_compat_42 = Off + +; This setting controls whether or not you are warned by PHP when initializing a +; session value into the global space. session.bug_compat_42 must be enabled before +; these warnings can be issued by PHP. See the directive above for more information. +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/session.bug-compat-warn +session.bug_compat_warn = Off + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +; http://php.net/session.referer-check +session.referer_check = + +; How many bytes to read from the file. +; http://php.net/session.entropy-length +;session.entropy_length = 32 + +; Specified here to create the session id. +; http://php.net/session.entropy-file +; Defaults to /dev/urandom +; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom +; If neither are found at compile time, the default is no entropy file. +; On windows, setting the entropy_length setting will activate the +; Windows random source (using the CryptoAPI) +;session.entropy_file = /dev/urandom + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +; http://php.net/session.cache-limiter +session.cache_limiter = nocache + +; Document expires after n minutes. +; http://php.net/session.cache-expire +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publicly accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +; http://php.net/session.use-trans-sid +session.use_trans_sid = 0 + +; Select a hash function for use in generating session ids. +; Possible Values +; 0 (MD5 128 bits) +; 1 (SHA-1 160 bits) +; This option may also be set to the name of any hash function supported by +; the hash extension. A list of available hashes is returned by the hash_algos() +; function. +; http://php.net/session.hash-function +session.hash_function = 0 + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; Possible values: +; 4 (4 bits: 0-9, a-f) +; 5 (5 bits: 0-9, a-v) +; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 +; http://php.net/session.hash-bits-per-character +session.hash_bits_per_character = 5 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +; form/fieldset are special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. If you want XHTML conformity, remove the form entry. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=,fieldset=" +; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry" +; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry" +; http://php.net/url-rewriter.tags +url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" + +; Enable upload progress tracking in $_SESSION +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.enabled +;session.upload_progress.enabled = On + +; Cleanup the progress information as soon as all POST data has been read +; (i.e. upload completed). +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.cleanup +;session.upload_progress.cleanup = On + +; A prefix used for the upload progress key in $_SESSION +; Default Value: "upload_progress_" +; Development Value: "upload_progress_" +; Production Value: "upload_progress_" +; http://php.net/session.upload-progress.prefix +;session.upload_progress.prefix = "upload_progress_" + +; The index name (concatenated with the prefix) in $_SESSION +; containing the upload progress information +; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" +; http://php.net/session.upload-progress.name +;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" + +; How frequently the upload progress should be updated. +; Given either in percentages (per-file), or in bytes +; Default Value: "1%" +; Development Value: "1%" +; Production Value: "1%" +; http://php.net/session.upload-progress.freq +;session.upload_progress.freq = "1%" + +; The minimum delay between updates, in seconds +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.upload-progress.min-freq +;session.upload_progress.min_freq = "1" + +[MSSQL] +; Allow or prevent persistent links. +mssql.allow_persistent = On + +; Maximum number of persistent links. -1 means no limit. +mssql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +mssql.max_links = -1 + +; Minimum error severity to display. +mssql.min_error_severity = 10 + +; Minimum message severity to display. +mssql.min_message_severity = 10 + +; Compatibility mode with old versions of PHP 3.0. +mssql.compatability_mode = Off + +; Connect timeout +;mssql.connect_timeout = 5 + +; Query timeout +;mssql.timeout = 60 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textlimit = 4096 + +; Valid range 0 - 2147483647. Default = 4096. +;mssql.textsize = 4096 + +; Limits the number of records in each batch. 0 = all records in one batch. +;mssql.batchsize = 0 + +; Specify how datetime and datetim4 columns are returned +; On => Returns data converted to SQL server settings +; Off => Returns values as YYYY-MM-DD hh:mm:ss +;mssql.datetimeconvert = On + +; Use NT authentication when connecting to the server +mssql.secure_connection = Off + +; Specify max number of processes. -1 = library default +; msdlib defaults to 25 +; FreeTDS defaults to 4096 +;mssql.max_procs = -1 + +; Specify client character set. +; If empty or not set the client charset from freetds.conf is used +; This is only used when compiled with FreeTDS +;mssql.charset = "ISO-8859-1" + +[Assertion] +; Assert(expr); active by default. +; http://php.net/assert.active +;assert.active = On + +; Issue a PHP warning for each failed assertion. +; http://php.net/assert.warning +;assert.warning = On + +; Don't bail out by default. +; http://php.net/assert.bail +;assert.bail = Off + +; User-function to be called if an assertion fails. +; http://php.net/assert.callback +;assert.callback = 0 + +; Eval the expression with current error_reporting(). Set to true if you want +; error_reporting(0) around the eval(). +; http://php.net/assert.quiet-eval +;assert.quiet_eval = 0 + +[mbstring] +; language for internal character representation. +; http://php.net/mbstring.language +;mbstring.language = Japanese + +; internal/script encoding. +; Some encoding cannot work as internal encoding. +; (e.g. SJIS, BIG5, ISO-2022-*) +; http://php.net/mbstring.internal-encoding +;mbstring.internal_encoding = EUC-JP + +; http input encoding. +; http://php.net/mbstring.http-input +;mbstring.http_input = auto + +; http output encoding. mb_output_handler must be +; registered as output buffer to function +; http://php.net/mbstring.http-output +;mbstring.http_output = SJIS + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +; http://php.net/mbstring.encoding-translation +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; auto means +; http://php.net/mbstring.detect-order +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +; http://php.net/mbstring.substitute-character +;mbstring.substitute_character = none; + +; overload(replace) single byte functions by mbstring functions. +; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), +; etc. Possible values are 0,1,2,4 or combination of them. +; For example, 7 for overload everything. +; 0: No overload +; 1: Overload mail() function +; 2: Overload str*() functions +; 4: Overload ereg*() functions +; http://php.net/mbstring.func-overload +;mbstring.func_overload = 0 + +; enable strict encoding detection. +;mbstring.strict_detection = Off + +; This directive specifies the regex pattern of content types for which mb_output_handler() +; is activated. +; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetype= + +[gd] +; Tell the jpeg decode to ignore warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +; http://php.net/gd.jpeg-ignore-warning +;gd.jpeg_ignore_warning = 0 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +; http://php.net/exif.encode-unicode +;exif.encode_unicode = ISO-8859-15 + +; http://php.net/exif.decode-unicode-motorola +;exif.decode_unicode_motorola = UCS-2BE + +; http://php.net/exif.decode-unicode-intel +;exif.decode_unicode_intel = UCS-2LE + +; http://php.net/exif.encode-jis +;exif.encode_jis = + +; http://php.net/exif.decode-jis-motorola +;exif.decode_jis_motorola = JIS + +; http://php.net/exif.decode-jis-intel +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +; http://php.net/tidy.default-config +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +; http://php.net/tidy.clean-output +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +; http://php.net/soap.wsdl-cache-enabled +soap.wsdl_cache_enabled=1 + +; Sets the directory name where SOAP extension will put cache files. +; http://php.net/soap.wsdl-cache-dir +soap.wsdl_cache_dir="/tmp" + +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +; http://php.net/soap.wsdl-cache-ttl +soap.wsdl_cache_ttl=86400 + +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + +[sysvshm] +; A default size of the shared memory segment +;sysvshm.init_mem = 10000 + +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + +[mcrypt] +; For more information about mcrypt settings see http://php.net/mcrypt-module-open + +; Directory where to load mcrypt algorithms +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.algorithms_dir= + +; Directory where to load mcrypt modes +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.modes_dir= + +[dba] +;dba.default_handler= + +; Local Variables: +; tab-width: 4 +; End: diff --git a/SOURCES/php.modconf b/SOURCES/php.modconf new file mode 100644 index 0000000..87f97c9 --- /dev/null +++ b/SOURCES/php.modconf @@ -0,0 +1,8 @@ +# +# PHP is an HTML-embedded scripting language which attempts to make it +# easy for developers to write dynamically generated webpages. +# + + LoadModule php5_module modules/libphp5.so + + diff --git a/SOURCES/php.ztsmodconf b/SOURCES/php.ztsmodconf new file mode 100644 index 0000000..54a094e --- /dev/null +++ b/SOURCES/php.ztsmodconf @@ -0,0 +1,4 @@ + + LoadModule php5_module modules/libphp5-zts.so + + diff --git a/SPECS/php.spec b/SPECS/php.spec new file mode 100644 index 0000000..d9f0f09 --- /dev/null +++ b/SPECS/php.spec @@ -0,0 +1,2209 @@ +# API/ABI check +%global apiver 20100412 +%global zendver 20100525 +%global pdover 20080721 +# Extension version +%global fileinfover 1.0.5 +%global pharver 2.0.1 +%global zipver 1.11.0 +%global jsonver 1.2.1 + +# Adds -z now to the linker flags +%global _hardened_build 1 + +# version used for php embedded library soname +%global embed_version 5.4 + +%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) + +# Regression tests take a long time, you can skip 'em with this +%{!?runselftest: %{expand: %%global runselftest 1}} + +# Use the arch-specific mysql_config binary to avoid mismatch with the +# arch detection heuristic used by bindir/mysql_config. +%global mysql_config %{_libdir}/mysql/mysql_config + +%global with_fpm 1 + +# Build mysql/mysqli/pdo extensions using libmysqlclient or only mysqlnd +%global with_libmysql 1 + +# Build ZTS extension or only NTS +%global with_zts 0 + +%if 0%{?__isa_bits:1} +%global isasuffix -%{__isa_bits} +%else +%global isasuffix %nil +%endif + +# /usr/sbin/apsx with httpd < 2.4 and defined as /usr/bin/apxs with httpd >= 2.4 +%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}} +%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} +# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 +%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} +%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}} + +%if 0%{?fedora} < 17 && 0%{?rhel} < 7 +%global with_zip 0 +%global with_libzip 0 +%global zipmod %nil +%else +%global with_zip 1 +%global with_libzip 1 +%global zipmod zip +%endif + +%if 0%{?fedora} < 18 && 0%{?rhel} < 7 +%global db_devel db4-devel +%else +%global db_devel libdb-devel +%endif + +#global rcver RC2 + +Summary: PHP scripting language for creating dynamic web sites +Name: php +Version: 5.4.16 +Release: 7%{?dist} +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM is licensed under BSD +License: PHP and Zend and BSD +Group: Development/Languages +URL: http://www.php.net/ + +Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.bz2 +Source1: php.conf +Source2: php.ini +Source3: macros.php +Source4: php-fpm.conf +Source5: php-fpm-www.conf +Source6: php-fpm.service +Source7: php-fpm.logrotate +Source8: php-fpm.sysconfig +Source9: php.modconf +Source10: php.ztsmodconf + +# Build fixes +Patch5: php-5.2.0-includedir.patch +Patch6: php-5.2.4-embed.patch +Patch7: php-5.3.0-recode.patch +Patch8: php-5.4.7-libdb.patch + +# Fixes for extension modules +# https://bugs.php.net/63171 no odbc call during timeout +Patch21: php-5.4.7-odbctimer.patch +# Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) +Patch22: php-5.4.16-pdopgsql.patch +# Fixed bug #64960 (Segfault in gc_zval_possible_root) +Patch23: php-5.4.16-gc.patch +# Fixed Bug #64915 (error_log ignored when daemonize=0) +Patch24: php-5.4.16-fpm.patch +# https://bugs.php.net/65143 php-cgi man page +# https://bugs.php.net/65142 phar man page +Patch25: php-5.4.16-man.patch + +# Functional changes +Patch40: php-5.4.0-dlopen.patch +Patch41: php-5.4.0-easter.patch +Patch42: php-5.3.1-systzdata-v10.patch +# See http://bugs.php.net/53436 +Patch43: php-5.4.0-phpize.patch +# Use system libzip instead of bundled one +Patch44: php-5.4.15-system-libzip.patch +# Use -lldap_r for OpenLDAP +Patch45: php-5.4.8-ldap_r.patch +# Make php_config.h constant across builds +Patch46: php-5.4.9-fixheader.patch +# drop "Configure command" from phpinfo output +Patch47: php-5.4.9-phpinfo.patch + +# Fixes for tests +Patch60: php-5.4.16-pdotests.patch + +# Security fixes +Patch100: php-5.4.17-CVE-2013-4013.patch +Patch101: php-5.4.16-CVE-2013-4248.patch + + +BuildRequires: bzip2-devel, curl-devel >= 7.9, gmp-devel +BuildRequires: httpd-devel >= 2.0.46-1, pam-devel +BuildRequires: libstdc++-devel, openssl-devel +BuildRequires: sqlite-devel >= 3.6.0 +BuildRequires: zlib-devel, smtpdaemon, libedit-devel +BuildRequires: pcre-devel >= 6.6 +BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++ +BuildRequires: libtool-ltdl-devel +%if %{with_libzip} +BuildRequires: libzip-devel >= 0.10 +%endif + +Obsoletes: php-dbg, php3, phpfi, stronghold-php +%if %{with_zts} +Obsoletes: php-zts < 5.3.7 +Provides: php-zts = %{version}-%{release} +Provides: php-zts%{?_isa} = %{version}-%{release} +%endif + +Requires: httpd-mmn = %{_httpd_mmn} +Provides: mod_php = %{version}-%{release} +Requires: php-common%{?_isa} = %{version}-%{release} +# For backwards-compatibility, require php-cli for the time being: +Requires: php-cli%{?_isa} = %{version}-%{release} +# To ensure correct /var/lib/php/session ownership: +Requires(pre): httpd + + +# Don't provides extensions, which are not shared library, as .so +%{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$} +%{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$} +%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$} +%{?filter_setup} + + +%description +PHP is an HTML-embedded scripting language. PHP attempts to make it +easy for developers to write dynamically generated web pages. PHP also +offers built-in database integration for several commercial and +non-commercial database management systems, so writing a +database-enabled webpage with PHP is fairly simple. The most common +use of PHP coding is probably as a replacement for CGI scripts. + +The php package contains the module (often referred to as mod_php) +which adds support for the PHP language to Apache HTTP Server. + +%package cli +Group: Development/Languages +Summary: Command-line interface for PHP +Requires: php-common%{?_isa} = %{version}-%{release} +Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release} +Provides: php-pcntl, php-pcntl%{?_isa} +Provides: php-readline, php-readline%{?_isa} + +%description cli +The php-cli package contains the command-line interface +executing PHP scripts, /usr/bin/php, and the CGI interface. + + +%if %{with_fpm} +%package fpm +Group: Development/Languages +Summary: PHP FastCGI Process Manager +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM and fpm are licensed under BSD +License: PHP and Zend and BSD +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: systemd-devel +BuildRequires: systemd-units +Requires: systemd-units +Requires(pre): /usr/sbin/useradd +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +# This is actually needed for the %%triggerun script but Requires(triggerun) +# is not valid. We can use %%post because this particular %%triggerun script +# should fire just after this package is installed. +Requires(post): systemd-sysv + +%description fpm +PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI +implementation with some additional features useful for sites of +any size, especially busier sites. +%endif + +%package common +Group: Development/Languages +Summary: Common files for PHP +# All files licensed under PHP version 3.01, except +# fileinfo is licensed under PHP version 3.0 +# regex, libmagic are licensed under BSD +# main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0 +License: PHP and BSD and ASL 1.0 +# ABI/API check - Arch specific +Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix} +Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix} +Provides: php(language) = %{version}, php(language)%{?_isa} = %{version} +# Provides for all builtin/shared modules: +Provides: php-bz2, php-bz2%{?_isa} +Provides: php-calendar, php-calendar%{?_isa} +Provides: php-core = %{version}, php-core%{?_isa} = %{version} +Provides: php-ctype, php-ctype%{?_isa} +Provides: php-curl, php-curl%{?_isa} +Provides: php-date, php-date%{?_isa} +Provides: php-ereg, php-ereg%{?_isa} +Provides: php-exif, php-exif%{?_isa} +Provides: php-fileinfo, php-fileinfo%{?_isa} +Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover} +Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover} +Provides: php-filter, php-filter%{?_isa} +Provides: php-ftp, php-ftp%{?_isa} +Provides: php-gettext, php-gettext%{?_isa} +Provides: php-gmp, php-gmp%{?_isa} +Provides: php-hash, php-hash%{?_isa} +Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version} +Provides: php-iconv, php-iconv%{?_isa} +Provides: php-json, php-json%{?_isa} +Provides: php-pecl-json = %{jsonver}, php-pecl-json%{?_isa} = %{jsonver} +Provides: php-pecl(json) = %{jsonver}, php-pecl(json)%{?_isa} = %{jsonver} +Provides: php-libxml, php-libxml%{?_isa} +Provides: php-openssl, php-openssl%{?_isa} +Provides: php-pecl-phar = %{pharver}, php-pecl-phar%{?_isa} = %{pharver} +Provides: php-pecl(phar) = %{pharver}, php-pecl(phar)%{?_isa} = %{pharver} +Provides: php-phar, php-phar%{?_isa} +Provides: php-pcre, php-pcre%{?_isa} +Provides: php-reflection, php-reflection%{?_isa} +Provides: php-session, php-session%{?_isa} +Provides: php-shmop, php-shmop%{?_isa} +Provides: php-simplexml, php-simplexml%{?_isa} +Provides: php-sockets, php-sockets%{?_isa} +Provides: php-spl, php-spl%{?_isa} +Provides: php-standard = %{version}, php-standard%{?_isa} = %{version} +Provides: php-tokenizer, php-tokenizer%{?_isa} +%if %{with_zip} +Provides: php-zip, php-zip%{?_isa} +Provides: php-pecl-zip = %{zipver}, php-pecl-zip%{?_isa} = %{zipver} +Provides: php-pecl(zip) = %{zipver}, php-pecl(zip)%{?_isa} = %{zipver} +Obsoletes: php-pecl-zip < 1.11 +%endif +Provides: php-zlib, php-zlib%{?_isa} +Obsoletes: php-openssl +Obsoletes: php-pecl-json < 1.2.2 +Obsoletes: php-pecl-phar < 1.2.4 +Obsoletes: php-pecl-Fileinfo < 1.0.5 +Obsoletes: php-mhash < 5.3.0 +%description common +The php-common package contains files used by both the php +package and the php-cli package. + +%package devel +Group: Development/Libraries +Summary: Files needed for building PHP extensions +Requires: php-cli%{?_isa} = %{version}-%{release}, autoconf, automake +Requires: pcre-devel%{?_isa} +Obsoletes: php-pecl-pdo-devel +%if %{with_zts} +Provides: php-zts-devel = %{version}-%{release} +Provides: php-zts-devel%{?_isa} = %{version}-%{release} +%endif + +%description devel +The php-devel package contains the files needed for building PHP +extensions. If you need to compile your own PHP extensions, you will +need to install this package. + +%package ldap +Summary: A module for PHP applications that use LDAP +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +Obsoletes: mod_php3-ldap, stronghold-php-ldap +BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel + +%description ldap +The php-ldap adds Lightweight Directory Access Protocol (LDAP) +support to PHP. LDAP is a set of protocols for accessing directory +services over the Internet. PHP is an HTML-embedded scripting +language. + +%package pdo +Summary: A database access abstraction module for PHP applications +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo +# ABI/API check - Arch specific +Provides: php-pdo-abi = %{pdover}%{isasuffix} +Provides: php(pdo-abi) = %{pdover}%{isasuffix} +Provides: php-sqlite3, php-sqlite3%{?_isa} +Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa} + +%description pdo +The php-pdo package contains a dynamic shared object that will add +a database access abstraction layer to PHP. This module provides +a common interface for accessing MySQL, PostgreSQL or other +databases. + +%if %{with_libmysql} +%package mysql +Summary: A module for PHP applications that use MySQL databases +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-pdo%{?_isa} = %{version}-%{release} +Provides: php_database +Provides: php-mysqli = %{version}-%{release} +Provides: php-mysqli%{?_isa} = %{version}-%{release} +Provides: php-pdo_mysql, php-pdo_mysql%{?_isa} +Obsoletes: mod_php3-mysql, stronghold-php-mysql +BuildRequires: mysql-devel >= 4.1.0 +Conflicts: php-mysqlnd + +%description mysql +The php-mysql package contains a dynamic shared object that will add +MySQL database support to PHP. MySQL is an object-relational database +management system. PHP is an HTML-embeddable scripting language. If +you need MySQL support for PHP applications, you will need to install +this package and the php package. +%endif + +%package mysqlnd +Summary: A module for PHP applications that use MySQL databases +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-pdo%{?_isa} = %{version}-%{release} +Provides: php_database +Provides: php-mysql = %{version}-%{release} +Provides: php-mysql%{?_isa} = %{version}-%{release} +Provides: php-mysqli = %{version}-%{release} +Provides: php-mysqli%{?_isa} = %{version}-%{release} +Provides: php-pdo_mysql, php-pdo_mysql%{?_isa} +%if ! %{with_libmysql} +Obsoletes: php-mysql < %{version}-%{release} +%endif + +%description mysqlnd +The php-mysqlnd package contains a dynamic shared object that will add +MySQL database support to PHP. MySQL is an object-relational database +management system. PHP is an HTML-embeddable scripting language. If +you need MySQL support for PHP applications, you will need to install +this package and the php package. + +This package use the MySQL Native Driver + +%package pgsql +Summary: A PostgreSQL database module for PHP +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-pdo%{?_isa} = %{version}-%{release} +Provides: php_database +Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa} +Obsoletes: mod_php3-pgsql, stronghold-php-pgsql +BuildRequires: krb5-devel, openssl-devel, postgresql-devel + +%description pgsql +The php-pgsql add PostgreSQL database support to PHP. +PostgreSQL is an object-relational database management +system that supports almost all SQL constructs. PHP is an +HTML-embedded scripting language. If you need back-end support for +PostgreSQL, you should install this package in addition to the main +php package. + +%package process +Summary: Modules for PHP script using system process interfaces +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +Provides: php-posix, php-posix%{?_isa} +Provides: php-sysvsem, php-sysvsem%{?_isa} +Provides: php-sysvshm, php-sysvshm%{?_isa} +Provides: php-sysvmsg, php-sysvmsg%{?_isa} + +%description process +The php-process package contains dynamic shared objects which add +support to PHP using system interfaces for inter-process +communication. + +%package odbc +Summary: A module for PHP applications that use ODBC databases +Group: Development/Languages +# All files licensed under PHP version 3.01, except +# pdo_odbc is licensed under PHP version 3.0 +License: PHP +Requires: php-pdo%{?_isa} = %{version}-%{release} +Provides: php_database +Provides: php-pdo_odbc, php-pdo_odbc%{?_isa} +Obsoletes: stronghold-php-odbc +BuildRequires: unixODBC-devel + +%description odbc +The php-odbc package contains a dynamic shared object that will add +database support through ODBC to PHP. ODBC is an open specification +which provides a consistent API for developers to use for accessing +data sources (which are often, but not always, databases). PHP is an +HTML-embeddable scripting language. If you need ODBC support for PHP +applications, you will need to install this package and the php +package. + +%package soap +Summary: A module for PHP applications that use the SOAP protocol +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: libxml2-devel + +%description soap +The php-soap package contains a dynamic shared object that will add +support to PHP for using the SOAP web services protocol. + +%package snmp +Summary: A module for PHP applications that query SNMP-managed devices +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp +BuildRequires: net-snmp-devel + +%description snmp +The php-snmp package contains a dynamic shared object that will add +support for querying SNMP devices to PHP. PHP is an HTML-embeddable +scripting language. If you need SNMP support for PHP applications, you +will need to install this package and the php package. + +%package xml +Summary: A module for PHP applications which use XML +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +Obsoletes: php-domxml, php-dom +Provides: php-dom, php-dom%{?_isa} +Provides: php-xsl, php-xsl%{?_isa} +Provides: php-domxml, php-domxml%{?_isa} +Provides: php-wddx, php-wddx%{?_isa} +Provides: php-xmlreader, php-xmlreader%{?_isa} +Provides: php-xmlwriter, php-xmlwriter%{?_isa} +BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1 + +%description xml +The php-xml package contains dynamic shared objects which add support +to PHP for manipulating XML documents using the DOM tree, +and performing XSL transformations on XML documents. + +%package xmlrpc +Summary: A module for PHP applications which use the XML-RPC protocol +Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libXMLRPC is licensed under BSD +License: PHP and BSD +Requires: php-common%{?_isa} = %{version}-%{release} + +%description xmlrpc +The php-xmlrpc package contains a dynamic shared object that will add +support for the XML-RPC protocol to PHP. + +%package mbstring +Summary: A module for PHP applications which need multi-byte string handling +Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libmbfl is licensed under LGPLv2 +# onigurama is licensed under BSD +# ucgendat is licensed under OpenLDAP +License: PHP and LGPLv2 and BSD and OpenLDAP +Requires: php-common%{?_isa} = %{version}-%{release} + +%description mbstring +The php-mbstring package contains a dynamic shared object that will add +support for multi-byte string handling to PHP. + +%package gd +Summary: A module for PHP applications for using the gd graphics library +Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libgd is licensed under BSD +License: PHP and BSD +Requires: php-common%{?_isa} = %{version}-%{release} +# Required to build the bundled GD library +BuildRequires: libjpeg-devel, libpng-devel, freetype-devel +BuildRequires: libXpm-devel, t1lib-devel + +%description gd +The php-gd package contains a dynamic shared object that will add +support for using the gd graphics library to PHP. + +%package bcmath +Summary: A module for PHP applications for using the bcmath library +Group: Development/Languages +# All files licensed under PHP version 3.01, except +# libbcmath is licensed under LGPLv2+ +License: PHP and LGPLv2+ +Requires: php-common%{?_isa} = %{version}-%{release} + +%description bcmath +The php-bcmath package contains a dynamic shared object that will add +support for using the bcmath library to PHP. + +%package dba +Summary: A database abstraction layer module for PHP applications +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +BuildRequires: %{db_devel}, tokyocabinet-devel +Requires: php-common%{?_isa} = %{version}-%{release} + +%description dba +The php-dba package contains a dynamic shared object that will add +support for using the DBA database abstraction layer to PHP. + +%package embedded +Summary: PHP library for embedding in applications +Group: System Environment/Libraries +Requires: php-common%{?_isa} = %{version}-%{release} +# doing a real -devel package for just the .so symlink is a bit overkill +Provides: php-embedded-devel = %{version}-%{release} +Provides: php-embedded-devel%{?_isa} = %{version}-%{release} + +%description embedded +The php-embedded package contains a library which can be embedded +into applications to provide PHP scripting language support. + +%package pspell +Summary: A module for PHP applications for using pspell interfaces +Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: aspell-devel >= 0.50.0 + +%description pspell +The php-pspell package contains a dynamic shared object that will add +support for using the pspell library to PHP. + +%package recode +Summary: A module for PHP applications for using the recode library +Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: recode-devel + +%description recode +The php-recode package contains a dynamic shared object that will add +support for using the recode library to PHP. + +%package intl +Summary: Internationalization extension for PHP applications +Group: System Environment/Libraries +# All files licensed under PHP version 3.01 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: libicu-devel >= 3.6 + +%description intl +The php-intl package contains a dynamic shared object that will add +support for using the ICU library to PHP. + +%package enchant +Summary: Enchant spelling extension for PHP applications +Group: System Environment/Libraries +# All files licensed under PHP version 3.0 +License: PHP +Requires: php-common%{?_isa} = %{version}-%{release} +BuildRequires: enchant-devel >= 1.2.4 + +%description enchant +The php-enchant package contains a dynamic shared object that will add +support for using the enchant library to PHP. + + +%prep +%setup -q -n php-%{version}%{?rcver} + +%patch5 -p1 -b .includedir +%patch6 -p1 -b .embed +%patch7 -p1 -b .recode +%patch8 -p1 -b .libdb + +%patch21 -p1 -b .odbctimer +%patch22 -p1 -b .pdopgsql +%patch23 -p1 -b .gc +%patch24 -p1 -b .fpm +%patch25 -p1 -b .manpages + +%patch40 -p1 -b .dlopen +%patch41 -p1 -b .easter +%patch42 -p1 -b .systzdata +%patch43 -p1 -b .headers +%if %{with_libzip} +%patch44 -p1 -b .systzip +%endif +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%patch45 -p1 -b .ldap_r +%endif +%patch46 -p1 -b .fixheader +%patch47 -p1 -b .phpinfo + +%patch60 -p1 -b .pdotests + +%patch100 -p1 -b .cve4113 +%patch101 -p1 -b .cve4248 + + +# Prevent %%doc confusion over LICENSE files +cp Zend/LICENSE Zend/ZEND_LICENSE +cp TSRM/LICENSE TSRM_LICENSE +cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT +cp ext/gd/libgd/README libgd_README +cp ext/gd/libgd/COPYING libgd_COPYING +cp sapi/fpm/LICENSE fpm_LICENSE +cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE +cp ext/mbstring/oniguruma/COPYING oniguruma_COPYING +cp ext/mbstring/ucgendat/OPENLDAP_LICENSE ucgendat_LICENSE +cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE +cp ext/phar/LICENSE phar_LICENSE +cp ext/bcmath/libbcmath/COPYING.LIB libbcmath_COPYING + +# Multiple builds for multiple SAPIs +mkdir build-cgi build-apache build-embedded \ +%if %{with_zts} + build-zts build-ztscli \ +%endif +%if %{with_fpm} + build-fpm +%endif + +# ----- Manage known as failed test ------- +# php_egg_logo_guid() removed by patch41 +rm -f tests/basic/php_egg_logo_guid.phpt +# affected by systzdata patch +rm -f ext/date/tests/timezone_location_get.phpt +# fails sometime +rm -f ext/sockets/tests/mcast_ipv?_recv.phpt + +# Safety check for API version change. +pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) +if test "x${pver}" != "x%{version}%{?rcver}"; then + : Error: Upstream PHP version is now ${pver}, expecting %{version}%{?rcver}. + : Update the version/rcver macros and rebuild. + exit 1 +fi + +vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` +if test "x${vapi}" != "x%{apiver}"; then + : Error: Upstream API version is now ${vapi}, expecting %{apiver}. + : Update the apiver macro and rebuild. + exit 1 +fi + +vzend=`sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h` +if test "x${vzend}" != "x%{zendver}"; then + : Error: Upstream Zend ABI version is now ${vzend}, expecting %{zendver}. + : Update the zendver macro and rebuild. + exit 1 +fi + +# Safety check for PDO ABI version change +vpdo=`sed -n '/#define PDO_DRIVER_API/{s/.*[ ]//;p}' ext/pdo/php_pdo_driver.h` +if test "x${vpdo}" != "x%{pdover}"; then + : Error: Upstream PDO ABI version is now ${vpdo}, expecting %{pdover}. + : Update the pdover macro and rebuild. + exit 1 +fi + +# Check for some extension version +ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}' ext/fileinfo/php_fileinfo.h) +if test "$ver" != "%{fileinfover}"; then + : Error: Upstream FILEINFO version is now ${ver}, expecting %{fileinfover}. + : Update the fileinfover macro and rebuild. + exit 1 +fi +ver=$(sed -n '/#define PHP_PHAR_VERSION /{s/.* "//;s/".*$//;p}' ext/phar/php_phar.h) +if test "$ver" != "%{pharver}"; then + : Error: Upstream PHAR version is now ${ver}, expecting %{pharver}. + : Update the pharver macro and rebuild. + exit 1 +fi +ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h) +if test "$ver" != "%{zipver}"; then + : Error: Upstream ZIP version is now ${ver}, expecting %{zipver}. + : Update the zipver macro and rebuild. + exit 1 +fi +ver=$(sed -n '/#define PHP_JSON_VERSION /{s/.* "//;s/".*$//;p}' ext/json/php_json.h) +if test "$ver" != "%{jsonver}"; then + : Error: Upstream JSON version is now ${ver}, expecting %{jsonver}. + : Update the jsonver macro and rebuild. + exit 1 +fi + +# https://bugs.php.net/63362 - Not needed but installed headers. +# Drop some Windows specific headers to avoid installation, +# before build to ensure they are really not needed. +rm -f TSRM/tsrm_win32.h \ + TSRM/tsrm_config.w32.h \ + Zend/zend_config.w32.h \ + ext/mysqlnd/config-win.h \ + ext/standard/winver.h \ + main/win32_internal_function_disabled.h \ + main/win95nt.h + +# Fix some bogus permissions +find . -name \*.[ch] -exec chmod 644 {} \; +chmod 644 README.* + +# php-fpm configuration files for tmpfiles.d +echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles + +# bring in newer config.guess and config.sub for aarch64 support +cp -f /usr/lib/rpm/config.{guess,sub} . + + +%build +# aclocal workaround - to be improved +cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 + +# Force use of system libtool: +libtoolize --force --copy +cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4 + +# Regenerate configure scripts (patches change config.m4's) +touch configure.in +./buildconf --force + +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign" +export CFLAGS + +# Install extension modules in %{_libdir}/php/modules. +EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR + +# Set PEAR_INSTALLDIR to ensure that the hard-coded include_path +# includes the PEAR directory even though pear is packaged +# separately. +PEAR_INSTALLDIR=%{_datadir}/pear; export PEAR_INSTALLDIR + +# Shell function to configure and build a PHP tree. +build() { +# Old/recent bison version seems to produce a broken parser; +# upstream uses GNU Bison 2.3. Workaround: +mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.[ch] Zend +ln -sf ../configure +%configure \ + --cache-file=../config.cache \ + --with-libdir=%{_lib} \ + --with-config-file-path=%{_sysconfdir} \ + --with-config-file-scan-dir=%{_sysconfdir}/php.d \ + --disable-debug \ + --with-pic \ + --disable-rpath \ + --without-pear \ + --with-bz2 \ + --with-exec-dir=%{_bindir} \ + --with-freetype-dir=%{_prefix} \ + --with-png-dir=%{_prefix} \ + --with-xpm-dir=%{_prefix} \ + --enable-gd-native-ttf \ + --with-t1lib=%{_prefix} \ + --without-gdbm \ + --with-gettext \ + --with-gmp \ + --with-iconv \ + --with-jpeg-dir=%{_prefix} \ + --with-openssl \ + --with-pcre-regex=%{_prefix} \ + --with-zlib \ + --with-layout=GNU \ + --enable-exif \ + --enable-ftp \ + --enable-sockets \ + --with-kerberos \ + --enable-shmop \ + --enable-calendar \ + --with-libxml-dir=%{_prefix} \ + --enable-xml \ + --with-system-tzdata \ + --with-mhash \ + $* +if test $? != 0; then + tail -500 config.log + : configure failed + exit 1 +fi + +make %{?_smp_mflags} +} + +# Build /usr/bin/php-cgi with the CGI SAPI, and all the shared extensions +pushd build-cgi + +build --libdir=%{_libdir}/php \ + --enable-pcntl \ + --enable-mbstring=shared \ + --enable-mbregex \ + --with-gd=shared \ + --enable-bcmath=shared \ + --enable-dba=shared --with-db4=%{_prefix} \ + --with-tcadb=%{_prefix} \ + --with-xmlrpc=shared \ + --with-ldap=shared --with-ldap-sasl \ + --enable-mysqlnd=shared \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-mysql-sock=%{mysql_sock} \ + --enable-dom=shared \ + --with-pgsql=shared \ + --enable-wddx=shared \ + --with-snmp=shared,%{_prefix} \ + --enable-soap=shared \ + --with-xsl=shared,%{_prefix} \ + --enable-xmlreader=shared --enable-xmlwriter=shared \ + --with-curl=shared,%{_prefix} \ + --enable-pdo=shared \ + --with-pdo-odbc=shared,unixODBC,%{_prefix} \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-pgsql=shared,%{_prefix} \ + --with-pdo-sqlite=shared,%{_prefix} \ + --with-sqlite3=shared,%{_prefix} \ + --enable-json=shared \ +%if %{with_zip} + --enable-zip=shared \ +%endif +%if %{with_libzip} + --with-libzip \ +%endif + --without-readline \ + --with-libedit \ + --with-pspell=shared \ + --enable-phar=shared \ + --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ + --enable-posix=shared \ + --with-unixODBC=shared,%{_prefix} \ + --enable-fileinfo=shared \ + --enable-intl=shared \ + --with-icu-dir=%{_prefix} \ + --with-enchant=shared,%{_prefix} \ + --with-recode=shared,%{_prefix} +popd + +without_shared="--without-gd \ + --disable-dom --disable-dba --without-unixODBC \ + --disable-xmlreader --disable-xmlwriter \ + --without-sqlite3 --disable-phar --disable-fileinfo \ + --disable-json --without-pspell --disable-wddx \ + --without-curl --disable-posix \ + --disable-sysvmsg --disable-sysvshm --disable-sysvsem" + +# Build Apache module, and the CLI SAPI, /usr/bin/php +pushd build-apache +build --with-apxs2=%{_httpd_apxs} \ + --libdir=%{_libdir}/php \ +%if %{with_libmysql} + --enable-pdo=shared \ + --with-mysql=shared,%{_prefix} \ + --with-mysqli=shared,%{mysql_config} \ + --with-pdo-mysql=shared,%{mysql_config} \ + --without-pdo-sqlite \ +%else + --without-mysql \ + --disable-pdo \ +%endif + ${without_shared} +popd + +%if %{with_fpm} +# Build php-fpm +pushd build-fpm +build --enable-fpm \ + --with-fpm-systemd \ + --libdir=%{_libdir}/php \ + --without-mysql \ + --disable-pdo \ + ${without_shared} +popd +%endif + +# Build for inclusion as embedded script language into applications, +# /usr/lib[64]/libphp5.so +pushd build-embedded +build --enable-embed \ + --without-mysql --disable-pdo \ + ${without_shared} +popd + +%if %{with_zts} +# Build a special thread-safe (mainly for modules) +pushd build-ztscli + +EXTENSION_DIR=%{_libdir}/php-zts/modules +build --includedir=%{_includedir}/php-zts \ + --libdir=%{_libdir}/php-zts \ + --enable-maintainer-zts \ + --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \ + --enable-pcntl \ + --enable-mbstring=shared \ + --enable-mbregex \ + --with-gd=shared \ + --enable-bcmath=shared \ + --enable-dba=shared --with-db4=%{_prefix} \ + --with-tcadb=%{_prefix} \ + --with-xmlrpc=shared \ + --with-ldap=shared --with-ldap-sasl \ + --enable-mysqlnd=shared \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-mysql-sock=%{mysql_sock} \ + --enable-mysqlnd-threading \ + --enable-dom=shared \ + --with-pgsql=shared \ + --enable-wddx=shared \ + --with-snmp=shared,%{_prefix} \ + --enable-soap=shared \ + --with-xsl=shared,%{_prefix} \ + --enable-xmlreader=shared --enable-xmlwriter=shared \ + --with-curl=shared,%{_prefix} \ + --enable-pdo=shared \ + --with-pdo-odbc=shared,unixODBC,%{_prefix} \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-pgsql=shared,%{_prefix} \ + --with-pdo-sqlite=shared,%{_prefix} \ + --with-sqlite3=shared,%{_prefix} \ + --enable-json=shared \ +%if %{with_zip} + --enable-zip=shared \ +%endif +%if %{with_libzip} + --with-libzip \ +%endif + --without-readline \ + --with-libedit \ + --with-pspell=shared \ + --enable-phar=shared \ + --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ + --enable-posix=shared \ + --with-unixODBC=shared,%{_prefix} \ + --enable-fileinfo=shared \ + --enable-intl=shared \ + --with-icu-dir=%{_prefix} \ + --with-enchant=shared,%{_prefix} \ + --with-recode=shared,%{_prefix} +popd + +# Build a special thread-safe Apache SAPI +pushd build-zts +build --with-apxs2=%{_httpd_apxs} \ + --includedir=%{_includedir}/php-zts \ + --libdir=%{_libdir}/php-zts \ + --enable-maintainer-zts \ + --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \ +%if %{with_libmysql} + --enable-pdo=shared \ + --with-mysql=shared,%{_prefix} \ + --with-mysqli=shared,%{mysql_config} \ + --with-pdo-mysql=shared,%{mysql_config} \ + --without-pdo-sqlite \ +%else + --without-mysql \ + --disable-pdo \ +%endif + ${without_shared} +popd + +### NOTE!!! EXTENSION_DIR was changed for the -zts build, so it must remain +### the last SAPI to be built. +%endif + + +%check +%if %runselftest +cd build-apache +# Run tests, using the CLI SAPI +export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 +export SKIP_ONLINE_TESTS=1 +unset TZ LANG LC_ALL +if ! make test; then + set +x + for f in `find .. -name \*.diff -type f -print`; do + echo "TEST FAILURE: $f --" + cat "$f" + echo "-- $f result ends." + done + set -x + #exit 1 +fi +unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ +%endif + +%install +%if %{with_zts} +# Install the extensions for the ZTS version +make -C build-ztscli install \ + INSTALL_ROOT=$RPM_BUILD_ROOT + +# rename extensions build with mysqlnd +mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysql.so \ + $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysql.so +mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqli.so \ + $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/mysqlnd_mysqli.so +mv $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysql.so \ + $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/pdo_mysqlnd.so + +%if %{with_libmysql} +# Install the extensions for the ZTS version modules for libmysql +make -C build-zts install-modules \ + INSTALL_ROOT=$RPM_BUILD_ROOT +%endif + +# rename ZTS binary +mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/zts-php +mv $RPM_BUILD_ROOT%{_bindir}/phpize $RPM_BUILD_ROOT%{_bindir}/zts-phpize +mv $RPM_BUILD_ROOT%{_bindir}/php-config $RPM_BUILD_ROOT%{_bindir}/zts-php-config +%endif + +# Install the version for embedded script language in applications + php_embed.h +make -C build-embedded install-sapi install-headers \ + INSTALL_ROOT=$RPM_BUILD_ROOT + +%if %{with_fpm} +# Install the php-fpm binary +make -C build-fpm install-fpm \ + INSTALL_ROOT=$RPM_BUILD_ROOT +%endif + +# Install everything from the CGI SAPI build +make -C build-cgi install \ + INSTALL_ROOT=$RPM_BUILD_ROOT + +# rename extensions build with mysqlnd +mv $RPM_BUILD_ROOT%{_libdir}/php/modules/mysql.so \ + $RPM_BUILD_ROOT%{_libdir}/php/modules/mysqlnd_mysql.so +mv $RPM_BUILD_ROOT%{_libdir}/php/modules/mysqli.so \ + $RPM_BUILD_ROOT%{_libdir}/php/modules/mysqlnd_mysqli.so +mv $RPM_BUILD_ROOT%{_libdir}/php/modules/pdo_mysql.so \ + $RPM_BUILD_ROOT%{_libdir}/php/modules/pdo_mysqlnd.so + +%if %{with_libmysql} +# Install the mysql extension build with libmysql +make -C build-apache install-modules \ + INSTALL_ROOT=$RPM_BUILD_ROOT +%endif + +# Install the default configuration file and icons +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_contentdir}/icons +install -m 644 php.gif $RPM_BUILD_ROOT%{_httpd_contentdir}/icons/php.gif + +# For third-party packaging: +install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php + +# install the DSO +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_moddir} +install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_httpd_moddir} + +%if %{with_zts} +# install the ZTS DSO +install -m 755 build-zts/libs/libphp5.so $RPM_BUILD_ROOT%{_httpd_moddir}/libphp5-zts.so +%endif + +# Apache config fragment +%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}" +# Single config file with httpd < 2.4 (fedora <= 17) +install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%if %{with_zts} +cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%endif +cat %{SOURCE1} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%else +# Dual config file with httpd >= 2.4 (fedora >= 18) +install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-php.conf +%if %{with_zts} +cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_modconfdir}/10-php.conf +%endif +install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%endif + +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d +%if %{with_zts} +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d +%endif +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php +install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session + +%if %{with_fpm} +# PHP-FPM stuff +# Log +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm +install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm +# Config +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d +install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf +mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default . +# tmpfiles.d +install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d +install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/php-fpm.conf +# install systemd unit files and scripts for handling server startup +install -m 755 -d $RPM_BUILD_ROOT%{_unitdir} +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/ +# LogRotate +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm +# Environment file +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm +%endif +# Fix the link +(cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar) + +# Generate files lists and stub .ini files for each subpackage +for mod in pgsql odbc ldap snmp xmlrpc \ + mysqlnd mysqlnd_mysql mysqlnd_mysqli pdo_mysqlnd \ + mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \ + pdo pdo_pgsql pdo_odbc pdo_sqlite json %{zipmod} \ + sqlite3 \ + enchant phar fileinfo intl \ + pspell curl wddx \ + posix sysvshm sysvsem sysvmsg recode \ +%if %{with_libmysql} + mysql mysqli pdo_mysql \ +%endif + ; do + cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${mod}.ini < files.${mod} < files.xml + +# The mysql and mysqli modules are both packaged in php-mysql +%if %{with_libmysql} +cat files.mysqli >> files.mysql +cat files.pdo_mysql >> files.mysql +%endif + +# mysqlnd +cat files.mysqlnd_mysql \ + files.mysqlnd_mysqli \ + files.pdo_mysqlnd \ + >> files.mysqlnd + +# Split out the PDO modules +cat files.pdo_pgsql >> files.pgsql +cat files.pdo_odbc >> files.odbc + +# sysv* and posix in packaged in php-process +cat files.sysv* files.posix > files.process + +# Package sqlite3 and pdo_sqlite with pdo; isolating the sqlite dependency +# isn't useful at this time since rpm itself requires sqlite. +cat files.pdo_sqlite >> files.pdo +cat files.sqlite3 >> files.pdo + +# Package json, zip, curl, phar and fileinfo in -common. +cat files.json files.curl files.phar files.fileinfo > files.common +%if %{with_zip} +cat files.zip >> files.common +%endif + +# Install the macros file: +install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm +sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ + -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \ + -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \ + -e "s/@PHP_VERSION@/%{version}/" \ +%if ! %{with_zts} + -e "/zts/d" \ +%endif + < %{SOURCE3} > macros.php +install -m 644 -c macros.php \ + $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php + +# Remove unpackaged files +rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \ + $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \ + $RPM_BUILD_ROOT%{_bindir}/{phptar} \ + $RPM_BUILD_ROOT%{_datadir}/pear \ + $RPM_BUILD_ROOT%{_libdir}/libphp5.la + +# Remove irrelevant docs +rm -f README.{Zeus,QNX,CVS-RULES} + + +%if %{with_fpm} +%pre fpm +# Add the "apache" user as we don't require httpd +getent group apache >/dev/null || \ + groupadd -g 48 -r apache +getent passwd apache >/dev/null || \ + useradd -r -u 48 -g apache -s /sbin/nologin \ + -d %{_httpd_contentdir} -c "Apache" apache +exit 0 + +%post fpm +%if 0%{?systemd_post:1} +%systemd_post php-fpm.service +%else +if [ $1 = 1 ]; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi +%endif + +%preun fpm +%if 0%{?systemd_preun:1} +%systemd_preun php-fpm.service +%else +if [ $1 = 0 ]; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable php-fpm.service >/dev/null 2>&1 || : + /bin/systemctl stop php-fpm.service >/dev/null 2>&1 || : +fi +%endif + +%postun fpm +%if 0%{?systemd_postun_with_restart:1} +%systemd_postun_with_restart php-fpm.service +%else +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ]; then + # Package upgrade, not uninstall + /bin/systemctl try-restart php-fpm.service >/dev/null 2>&1 || : +fi +%endif + +# Handle upgrading from SysV initscript to native systemd unit. +# We can tell if a SysV version of php-fpm was previously installed by +# checking to see if the initscript is present. +%triggerun fpm -- php-fpm +if [ -f /etc/rc.d/init.d/php-fpm ]; then + # Save the current service runlevel info + # User must manually run systemd-sysv-convert --apply php-fpm + # to migrate them to systemd targets + /usr/bin/systemd-sysv-convert --save php-fpm >/dev/null 2>&1 || : + + # Run these because the SysV package being removed won't do them + /sbin/chkconfig --del php-fpm >/dev/null 2>&1 || : + /bin/systemctl try-restart php-fpm.service >/dev/null 2>&1 || : +fi +%endif + +%post embedded -p /sbin/ldconfig +%postun embedded -p /sbin/ldconfig + +%files +%{_httpd_moddir}/libphp5.so +%if %{with_zts} +%{_httpd_moddir}/libphp5-zts.so +%endif +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session +%config(noreplace) %{_httpd_confdir}/php.conf +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +%config(noreplace) %{_httpd_modconfdir}/10-php.conf +%endif +%{_httpd_contentdir}/icons/php.gif + +%files common -f files.common +%doc CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS README* +%doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT +%doc libmagic_LICENSE +%doc phar_LICENSE +%doc php.ini-* +%config(noreplace) %{_sysconfdir}/php.ini +%dir %{_sysconfdir}/php.d +%dir %{_libdir}/php +%dir %{_libdir}/php/modules +%if %{with_zts} +%dir %{_sysconfdir}/php-zts.d +%dir %{_libdir}/php-zts +%dir %{_libdir}/php-zts/modules +%endif +%dir %{_localstatedir}/lib/php +%dir %{_datadir}/php + +%files cli +%{_bindir}/php +%{_bindir}/php-cgi +%{_bindir}/phar.phar +%{_bindir}/phar +# provides phpize here (not in -devel) for pecl command +%{_bindir}/phpize +%{_mandir}/man1/php.1* +%{_mandir}/man1/php-cgi.1* +%{_mandir}/man1/phar.1* +%{_mandir}/man1/phar.phar.1* +%{_mandir}/man1/phpize.1* +%doc sapi/cgi/README* sapi/cli/README + +%if %{with_fpm} +%files fpm +%doc php-fpm.conf.default +%doc fpm_LICENSE +%config(noreplace) %{_sysconfdir}/php-fpm.conf +%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm +%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm +%{_prefix}/lib/tmpfiles.d/php-fpm.conf +%{_unitdir}/php-fpm.service +%{_sbindir}/php-fpm +%dir %{_sysconfdir}/php-fpm.d +# log owned by apache for log +%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm +%dir /run/php-fpm +%{_mandir}/man8/php-fpm.8* +%dir %{_datadir}/fpm +%{_datadir}/fpm/status.html +%endif + +%files devel +%{_bindir}/php-config +%{_includedir}/php +%{_libdir}/php/build +%if %{with_zts} +%{_bindir}/zts-php-config +%{_includedir}/php-zts +%{_bindir}/zts-phpize +# usefull only to test other module during build +%{_bindir}/zts-php +%{_libdir}/php-zts/build +%endif +%{_mandir}/man1/php-config.1* +%{_sysconfdir}/rpm/macros.php + +%files embedded +%{_libdir}/libphp5.so +%{_libdir}/libphp5-%{embed_version}.so + +%files pgsql -f files.pgsql +%if %{with_libmysql} +%files mysql -f files.mysql +%endif +%files odbc -f files.odbc +%files ldap -f files.ldap +%files snmp -f files.snmp +%files xml -f files.xml +%files xmlrpc -f files.xmlrpc +%files mbstring -f files.mbstring +%doc libmbfl_LICENSE +%doc oniguruma_COPYING +%doc ucgendat_LICENSE +%files gd -f files.gd +%doc libgd_README +%doc libgd_COPYING +%files soap -f files.soap +%files bcmath -f files.bcmath +%doc libbcmath_COPYING +%files dba -f files.dba +%files pdo -f files.pdo +%files pspell -f files.pspell +%files intl -f files.intl +%files process -f files.process +%files recode -f files.recode +%files enchant -f files.enchant +%files mysqlnd -f files.mysqlnd + + +%changelog +* Mon Nov 4 2013 Remi Collet - 5.4.16-7 +- fix for non x86 build #1023796 + +* Mon Aug 19 2013 Remi Collet - 5.4.16-5 +- fix enchant package summary and description +- add security fix for CVE-2013-4248 + +* Thu Jul 18 2013 Remi Collet - 5.4.16-4 +- improve mod_php, pgsql and ldap description +- add provides php(pdo-abi) for consistency with php(api) and php(zend-abi) +- use %%__isa_bits instead of %%__isa in ABI suffix + +* Fri Jul 12 2013 Remi Collet - 5.4.16-3 +- add security fix for CVE-2013-4113 +- add missing ASL 1.0 license +- rebuild for net-snmp + +* Tue Jul 2 2013 Remi Collet 5.4.16-2 +- add missing man pages (phar, php-cgi) #948873 + +* Thu Jun 6 2013 Remi Collet 5.4.16-1 +- update to 5.4.16 +- switch systemd unit to Type=notify +- patch for upstream Bug #64915 error_log ignored when daemonize=0 +- patch for upstream Bug #64949 Buffer overflow in _pdo_pgsql_error +- patch for upstream bug #64960 Segfault in gc_zval_possible_root +- add version to "Obsoletes" +- own /usr/share/fpm + +* Tue Apr 30 2013 Daniel Mach - 5.4.14-1.2 +- Rebuild for cyrus-sasl + +* Thu Apr 11 2013 Remi Collet 5.4.14-1 +- update to 5.4.14 +- clean old deprecated options + +* Mon Apr 08 2013 Daniel Mach - 5.4.13-1.1 +- Rebuild for icu + +* Thu Mar 14 2013 Remi Collet 5.4.13-1 +- update to 5.4.13 +- security fix for CVE-2013-1643 +- Hardened build (links with -z now option) +- Remove %%config from /etc/rpm/macros.php + +* Thu Feb 21 2013 Remi Collet 5.4.12-2 +- make php-mysql package optional (still enabled) +- make ZTS build optional (and disabled) + +* Wed Feb 20 2013 Remi Collet 5.4.12-1 +- update to 5.4.12 +- security fix for CVE-2013-1635 +- enable tokyocabinet dba handler +- upstream patch (5.4.13) to fix dval to lval conversion + https://bugs.php.net/64142 +- upstream patch (5.4.13) for 2 failed tests +- fix buit-in web server on ppc64 (fdset usage) + https://bugs.php.net/64128 + +* Wed Jan 16 2013 Remi Collet 5.4.11-1 +- update to 5.4.11 +- fix php.conf to allow MultiViews managed by php scripts + +* Wed Dec 19 2012 Remi Collet 5.4.10-1 +- update to 5.4.10 +- remove patches merged upstream + +* Tue Dec 11 2012 Remi Collet 5.4.9-3 +- drop "Configure Command" from phpinfo output + +* Tue Dec 11 2012 Joe Orton - 5.4.9-2 +- prevent php_config.h changes across (otherwise identical) rebuilds + +* Thu Nov 22 2012 Remi Collet 5.4.9-1 +- update to 5.4.9 + +* Thu Nov 15 2012 Remi Collet 5.4.9-0.5.RC1 +- switch back to upstream generated scanner/parser + +* Thu Nov 15 2012 Remi Collet 5.4.9-0.4.RC1 +- use _httpd_contentdir macro and fix php.gif path + +* Wed Nov 14 2012 Remi Collet 5.4.9-0.3.RC1 +- improve system libzip patch to use pkg-config + +* Wed Nov 14 2012 Remi Collet 5.4.9-0.2.RC1 +- use _httpd_moddir macro + +* Wed Nov 14 2012 Remi Collet 5.4.9-0.1.RC1 +- update to 5.4.9RC1 +- improves php.conf (use FilesMatch + SetHandler) +- improves filter (httpd module) +- apply ldap_r patch on fedora >= 18 only + +* Fri Nov 9 2012 Remi Collet 5.4.8-6 +- clarify Licenses +- missing provides xmlreader and xmlwriter +- modernize spec +- change php embedded library soname version to 5.4 + +* Tue Nov 6 2012 Remi Collet 5.4.8-5 +- fix _httpd_mmn macro definition + +* Mon Nov 5 2012 Remi Collet 5.4.8-4 +- fix mysql_sock macro definition + +* Thu Oct 25 2012 Remi Collet 5.4.8-3 +- fix installed headers + +* Tue Oct 23 2012 Joe Orton - 5.4.8-2 +- use libldap_r for ldap extension + +* Thu Oct 18 2012 Remi Collet 5.4.8-1 +- update to 5.4.8 +- define both session.save_handler and session.save_path +- fix possible segfault in libxml (#828526) +- php-fpm: create apache user if needed +- use SKIP_ONLINE_TEST during make test +- php-devel requires pcre-devel and php-cli (instead of php) + +* Fri Oct 5 2012 Remi Collet 5.4.7-11 +- provides php-phar +- update systzdata patch to v10, timezone are case insensitive + +* Mon Oct 1 2012 Remi Collet 5.4.7-10 +- fix typo in systemd macro + +* Mon Oct 1 2012 Remi Collet 5.4.7-9 +- php-fpm: enable PrivateTmp +- php-fpm: new systemd macros (#850268) +- php-fpm: add upstream patch for startup issue (#846858) + +* Fri Sep 28 2012 Remi Collet 5.4.7-8 +- systemd integration, https://bugs.php.net/63085 +- no odbc call during timeout, https://bugs.php.net/63171 +- check sqlite3_column_table_name, https://bugs.php.net/63149 + +* Mon Sep 24 2012 Remi Collet 5.4.7-7 +- most failed tests explained (i386, x86_64) + +* Wed Sep 19 2012 Remi Collet 5.4.7-6 +- fix for http://bugs.php.net/63126 (#783967) + +* Wed Sep 19 2012 Remi Collet 5.4.7-5 +- patch to ensure we use latest libdb (not libdb4) + +* Wed Sep 19 2012 Remi Collet 5.4.7-4 +- really fix rhel tests (use libzip and libdb) + +* Tue Sep 18 2012 Remi Collet 5.4.7-3 +- fix test to enable zip extension on RHEL-7 + +* Mon Sep 17 2012 Remi Collet 5.4.7-2 +- remove session.save_path from php.ini + move it to apache and php-fpm configuration files + +* Fri Sep 14 2012 Remi Collet 5.4.7-1 +- update to 5.4.7 + http://www.php.net/releases/5_4_7.php +- php-fpm: don't daemonize + +* Fri Aug 31 2012 Joe Orton - 5.4.6-2.1 +- drop mcrypt, tidy, mssql, dblib, imap, interbase support + +* Mon Aug 20 2012 Remi Collet 5.4.6-2 +- enable php-fpm on secondary arch (#849490) + +* Fri Aug 17 2012 Remi Collet 5.4.6-1 +- update to 5.4.6 +- update to v9 of systzdata patch +- backport fix for new libxml + +* Fri Jul 20 2012 Remi Collet 5.4.5-1 +- update to 5.4.5 + +* Mon Jul 02 2012 Remi Collet 5.4.4-4 +- also provide php(language)%%{_isa} +- define %%{php_version} + +* Mon Jul 02 2012 Remi Collet 5.4.4-3 +- drop BR for libevent (#835671) +- provide php(language) to allow version check + +* Thu Jun 21 2012 Remi Collet 5.4.4-2 +- add missing provides (core, ereg, filter, standard) + +* Thu Jun 14 2012 Remi Collet 5.4.4-1 +- update to 5.4.4 (CVE-2012-2143, CVE-2012-2386) +- use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d +- use /run/php-fpm instead of /var/run/php-fpm + +* Wed May 09 2012 Remi Collet 5.4.3-1 +- update to 5.4.3 (CVE-2012-2311, CVE-2012-2329) + +* Thu May 03 2012 Remi Collet 5.4.2-1 +- update to 5.4.2 (CVE-2012-1823) + +* Fri Apr 27 2012 Remi Collet 5.4.1-1 +- update to 5.4.1 + +* Wed Apr 25 2012 Joe Orton - 5.4.0-6 +- rebuild for new icu +- switch (conditionally) to libdb-devel + +* Sat Mar 31 2012 Remi Collet 5.4.0-5 +- fix Loadmodule with MPM event (use ZTS if not MPM worker) +- split conf.d/php.conf + conf.modules.d/10-php.conf with httpd 2.4 + +* Thu Mar 29 2012 Joe Orton - 5.4.0-4 +- rebuild for missing automatic provides (#807889) + +* Mon Mar 26 2012 Joe Orton - 5.4.0-3 +- really use _httpd_mmn + +* Mon Mar 26 2012 Joe Orton - 5.4.0-2 +- rebuild against httpd 2.4 +- use _httpd_mmn, _httpd_apxs macros + +* Fri Mar 02 2012 Remi Collet 5.4.0-1 +- update to PHP 5.4.0 finale + +* Sat Feb 18 2012 Remi Collet 5.4.0-0.4.RC8 +- update to PHP 5.4.0RC8 + +* Sat Feb 04 2012 Remi Collet 5.4.0-0.3.RC7 +- update to PHP 5.4.0RC7 +- provides env file for php-fpm (#784770) +- add patch to use system libzip (thanks to spot) +- don't provide INSTALL file + +* Wed Jan 25 2012 Remi Collet 5.4.0-0.2.RC6 +- all binaries in /usr/bin with zts prefix + +* Wed Jan 18 2012 Remi Collet 5.4.0-0.1.RC6 +- update to PHP 5.4.0RC6 + https://fedoraproject.org/wiki/Features/Php54 + +* Sun Jan 08 2012 Remi Collet 5.3.8-4.4 +- fix systemd unit + +* Mon Dec 12 2011 Remi Collet 5.3.8-4.3 +- switch to systemd + +* Tue Dec 06 2011 Adam Jackson - 5.3.8-4.2 +- Rebuild for new libpng + +* Wed Oct 26 2011 Marcela Mašláňová - 5.3.8-3.2 +- rebuild with new gmp without compat lib + +* Wed Oct 12 2011 Peter Schiffer - 5.3.8-3.1 +- rebuild with new gmp + +* Wed Sep 28 2011 Remi Collet 5.3.8-3 +- revert is_a() to php <= 5.3.6 behavior (from upstream) + with new option (allow_string) for new behavior + +* Tue Sep 13 2011 Remi Collet 5.3.8-2 +- add mysqlnd sub-package +- drop patch4, use --libdir to use /usr/lib*/php/build +- add patch to redirect mysql.sock (in mysqlnd) + +* Tue Aug 23 2011 Remi Collet 5.3.8-1 +- update to 5.3.8 + http://www.php.net/ChangeLog-5.php#5.3.8 + +* Thu Aug 18 2011 Remi Collet 5.3.7-1 +- update to 5.3.7 + http://www.php.net/ChangeLog-5.php#5.3.7 +- merge php-zts into php (#698084) + +* Tue Jul 12 2011 Joe Orton - 5.3.6-4 +- rebuild for net-snmp SONAME bump + +* Mon Apr 4 2011 Remi Collet 5.3.6-3 +- enable mhash extension (emulated by hash extension) + +* Wed Mar 23 2011 Remi Collet 5.3.6-2 +- rebuild for new MySQL client library + +* Thu Mar 17 2011 Remi Collet 5.3.6-1 +- update to 5.3.6 + http://www.php.net/ChangeLog-5.php#5.3.6 +- fix php-pdo arch specific requires + +* Tue Mar 15 2011 Joe Orton - 5.3.5-6 +- disable zip extension per "No Bundled Libraries" policy (#551513) + +* Mon Mar 07 2011 Caolán McNamara 5.3.5-5 +- rebuild for icu 4.6 + +* Mon Feb 28 2011 Remi Collet 5.3.5-4 +- fix systemd-units requires + +* Thu Feb 24 2011 Remi Collet 5.3.5-3 +- add tmpfiles.d configuration for php-fpm +- add Arch specific requires/provides + +* Wed Feb 09 2011 Fedora Release Engineering - 5.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 07 2011 Remi Collet 5.3.5-1 +- update to 5.3.5 + http://www.php.net/ChangeLog-5.php#5.3.5 +- clean duplicate configure options + +* Tue Dec 28 2010 Remi Collet 5.3.4-2 +- rebuild against MySQL 5.5.8 +- remove all RPM_SOURCE_DIR + +* Sun Dec 12 2010 Remi Collet 5.3.4-1.1 +- security patch from upstream for #660517 + +* Sat Dec 11 2010 Remi Collet 5.3.4-1 +- update to 5.3.4 + http://www.php.net/ChangeLog-5.php#5.3.4 +- move phpize to php-cli (see #657812) + +* Wed Dec 1 2010 Remi Collet 5.3.3-5 +- ghost /var/run/php-fpm (see #656660) +- add filter_setup to not provides extensions as .so + +* Mon Nov 1 2010 Joe Orton - 5.3.3-4 +- use mysql_config in libdir directly to avoid biarch build failures + +* Fri Oct 29 2010 Joe Orton - 5.3.3-3 +- rebuild for new net-snmp + +* Sun Oct 10 2010 Remi Collet 5.3.3-2 +- add php-fpm sub-package + +* Thu Jul 22 2010 Remi Collet 5.3.3-1 +- PHP 5.3.3 released + +* Fri Apr 30 2010 Remi Collet 5.3.2-3 +- garbage collector upstream patches (#580236) + +* Fri Apr 02 2010 Caolán McNamara 5.3.2-2 +- rebuild for icu 4.4 + +* Sat Mar 06 2010 Remi Collet 5.3.2-1 +- PHP 5.3.2 Released! +- remove mime_magic option (now provided by fileinfo, by emu) +- add patch for http://bugs.php.net/50578 +- remove patch for libedit (upstream) +- add runselftest option to allow build without test suite + +* Fri Nov 27 2009 Joe Orton - 5.3.1-3 +- update to v7 of systzdata patch + +* Wed Nov 25 2009 Joe Orton - 5.3.1-2 +- fix build with autoconf 2.6x + +* Fri Nov 20 2009 Remi Collet 5.3.1-1 +- update to 5.3.1 +- remove openssl patch (merged upstream) +- add provides for php-pecl-json +- add prod/devel php.ini in doc + +* Tue Nov 17 2009 Tom "spot" Callaway - 5.3.0-7 +- use libedit instead of readline to resolve licensing issues + +* Tue Aug 25 2009 Tomas Mraz - 5.3.0-6 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 5.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 16 2009 Joe Orton 5.3.0-4 +- rediff systzdata patch + +* Thu Jul 16 2009 Joe Orton 5.3.0-3 +- update to v6 of systzdata patch; various fixes + +* Tue Jul 14 2009 Joe Orton 5.3.0-2 +- update to v5 of systzdata patch; parses zone.tab and extracts + timezone->{country-code,long/lat,comment} mapping table + +* Sun Jul 12 2009 Remi Collet 5.3.0-1 +- update to 5.3.0 +- remove ncurses, dbase, mhash extensions +- add enchant, sqlite3, intl, phar, fileinfo extensions +- raise sqlite version to 3.6.0 (for sqlite3, build with --enable-load-extension) +- sync with upstream "production" php.ini + +* Sun Jun 21 2009 Remi Collet 5.2.10-1 +- update to 5.2.10 +- add interbase sub-package + +* Sat Feb 28 2009 Remi Collet - 5.2.9-1 +- update to 5.2.9 + +* Thu Feb 26 2009 Fedora Release Engineering - 5.2.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 5 2009 Joe Orton 5.2.8-9 +- add recode support, -recode subpackage (#106755) +- add -zts subpackage with ZTS-enabled build of httpd SAPI +- adjust php.conf to use -zts SAPI build for worker MPM + +* Wed Feb 4 2009 Joe Orton 5.2.8-8 +- fix patch fuzz, renumber patches + +* Wed Feb 4 2009 Joe Orton 5.2.8-7 +- drop obsolete configure args +- drop -odbc patch (#483690) + +* Mon Jan 26 2009 Joe Orton 5.2.8-5 +- split out sysvshm, sysvsem, sysvmsg, posix into php-process + +* Sun Jan 25 2009 Joe Orton 5.2.8-4 +- move wddx to php-xml, build curl shared in -common +- remove BR for expat-devel, bogus configure option + +* Fri Jan 23 2009 Joe Orton 5.2.8-3 +- rebuild for new MySQL + +* Sat Dec 13 2008 Remi Collet 5.2.8-2 +- libtool 2 workaround for phpize (#476004) +- add missing php_embed.h (#457777) + +* Tue Dec 09 2008 Remi Collet 5.2.8-1 +- update to 5.2.8 + +* Sat Dec 06 2008 Remi Collet 5.2.7-1.1 +- libtool 2 workaround + +* Fri Dec 05 2008 Remi Collet 5.2.7-1 +- update to 5.2.7 +- enable pdo_dblib driver in php-mssql + +* Mon Nov 24 2008 Joe Orton 5.2.6-7 +- tweak Summary, thanks to Richard Hughes + +* Tue Nov 4 2008 Joe Orton 5.2.6-6 +- move gd_README to php-gd +- update to r4 of systzdata patch; introduces a default timezone + name of "System/Localtime", which uses /etc/localtime (#469532) + +* Sat Sep 13 2008 Remi Collet 5.2.6-5 +- enable XPM support in php-gd +- Fix BR for php-gd + +* Sun Jul 20 2008 Remi Collet 5.2.6-4 +- enable T1lib support in php-gd + +* Mon Jul 14 2008 Joe Orton 5.2.6-3 +- update to 5.2.6 +- sync default php.ini with upstream +- drop extension_dir from default php.ini, rely on hard-coded + default, to make php-common multilib-safe (#455091) +- update to r3 of systzdata patch + +* Thu Apr 24 2008 Joe Orton 5.2.5-7 +- split pspell extension out into php-spell (#443857) + +* Tue Feb 19 2008 Fedora Release Engineering - 5.2.5-6 +- Autorebuild for GCC 4.3 + +* Fri Jan 11 2008 Joe Orton 5.2.5-5 +- ext/date: use system timezone database + +* Fri Dec 28 2007 Joe Orton 5.2.5-4 +- rebuild for libc-client bump + +* Wed Dec 05 2007 Release Engineering - 5.2.5-3 + - Rebuild for openssl bump + +* Wed Dec 5 2007 Joe Orton 5.2.5-2 +- update to 5.2.5 + +* Mon Oct 15 2007 Joe Orton 5.2.4-3 +- correct pcre BR version (#333021) +- restore metaphone fix (#205714) +- add READMEs to php-cli + +* Sun Sep 16 2007 Joe Orton 5.2.4-2 +- update to 5.2.4 + +* Sun Sep 2 2007 Joe Orton 5.2.3-9 +- rebuild for fixed APR + +* Tue Aug 28 2007 Joe Orton 5.2.3-8 +- add ldconfig post/postun for -embedded (Hans de Goede) + +* Fri Aug 10 2007 Hans de Goede 5.2.3-7 +- add php-embedded sub-package + +* Fri Aug 10 2007 Joe Orton 5.2.3-6 +- fix build with new glibc +- fix License + +* Mon Jul 16 2007 Joe Orton 5.2.3-5 +- define php_extdir in macros.php + +* Mon Jul 2 2007 Joe Orton 5.2.3-4 +- obsolete php-dbase + +* Tue Jun 19 2007 Joe Orton 5.2.3-3 +- add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy) +- enable dbase extension and package in -common + +* Fri Jun 8 2007 Joe Orton 5.2.3-2 +- update to 5.2.3 (thanks to Jeff Sheltren) + +* Wed May 9 2007 Joe Orton 5.2.2-4 +- fix php-pdo *_arg_force_ref global symbol abuse (#216125) + +* Tue May 8 2007 Joe Orton 5.2.2-3 +- rebuild against uw-imap-devel + +* Fri May 4 2007 Joe Orton 5.2.2-2 +- update to 5.2.2 +- synch changes from upstream recommended php.ini + +* Thu Mar 29 2007 Joe Orton 5.2.1-5 +- enable SASL support in LDAP extension (#205772) + +* Wed Mar 21 2007 Joe Orton 5.2.1-4 +- drop mime_magic extension (deprecated by php-pecl-Fileinfo) + +* Mon Feb 19 2007 Joe Orton 5.2.1-3 +- fix regression in str_{i,}replace (from upstream) + +* Thu Feb 15 2007 Joe Orton 5.2.1-2 +- update to 5.2.1 +- add Requires(pre) for httpd +- trim %%changelog to versions >= 5.0.0 + +* Thu Feb 8 2007 Joe Orton 5.2.0-10 +- bump default memory_limit to 32M (#220821) +- mark config files noreplace again (#174251) +- drop trailing dots from Summary fields +- use standard BuildRoot +- drop libtool15 patch (#226294) + +* Tue Jan 30 2007 Joe Orton 5.2.0-9 +- add php(api), php(zend-abi) provides (#221302) +- package /usr/share/php and append to default include_path (#225434) + +* Tue Dec 5 2006 Joe Orton 5.2.0-8 +- fix filter.h installation path +- fix php-zend-abi version (Remi Collet, #212804) + +* Tue Nov 28 2006 Joe Orton 5.2.0-7 +- rebuild again + +* Tue Nov 28 2006 Joe Orton 5.2.0-6 +- rebuild for net-snmp soname bump + +* Mon Nov 27 2006 Joe Orton 5.2.0-5 +- build json and zip shared, in -common (Remi Collet, #215966) +- obsolete php-json and php-pecl-zip +- build readline extension into /usr/bin/php* (#210585) +- change module subpackages to require php-common not php (#177821) + +* Wed Nov 15 2006 Joe Orton 5.2.0-4 +- provide php-zend-abi (#212804) +- add /etc/rpm/macros.php exporting interface versions +- synch with upstream recommended php.ini + +* Wed Nov 15 2006 Joe Orton 5.2.0-3 +- update to 5.2.0 (#213837) +- php-xml provides php-domxml (#215656) +- fix php-pdo-abi provide (#214281) + +* Tue Oct 31 2006 Joseph Orton 5.1.6-4 +- rebuild for curl soname bump +- add build fix for curl 7.16 API + +* Wed Oct 4 2006 Joe Orton 5.1.6-3 +- from upstream: add safety checks against integer overflow in _ecalloc + +* Tue Aug 29 2006 Joe Orton 5.1.6-2 +- update to 5.1.6 (security fixes) +- bump default memory_limit to 16M (#196802) + +* Wed Jul 12 2006 Jesse Keating - 5.1.4-8.1 +- rebuild + +* Fri Jun 9 2006 Joe Orton 5.1.4-8 +- Provide php-posix (#194583) +- only provide php-pcntl from -cli subpackage +- add missing defattr's (thanks to Matthias Saou) + +* Fri Jun 9 2006 Joe Orton 5.1.4-7 +- move Obsoletes for php-openssl to -common (#194501) +- Provide: php-cgi from -cli subpackage + +* Fri Jun 2 2006 Joe Orton 5.1.4-6 +- split out php-cli, php-common subpackages (#177821) +- add php-pdo-abi version export (#193202) + +* Wed May 24 2006 Radek Vokal 5.1.4-5.1 +- rebuilt for new libnetsnmp + +* Thu May 18 2006 Joe Orton 5.1.4-5 +- provide mod_php (#187891) +- provide php-cli (#192196) +- use correct LDAP fix (#181518) +- define _GNU_SOURCE in php_config.h and leave it defined +- drop (circular) dependency on php-pear + +* Mon May 8 2006 Joe Orton 5.1.4-3 +- update to 5.1.4 + +* Wed May 3 2006 Joe Orton 5.1.3-3 +- update to 5.1.3 + +* Tue Feb 28 2006 Joe Orton 5.1.2-5 +- provide php-api (#183227) +- add provides for all builtin modules (Tim Jackson, #173804) +- own %%{_libdir}/php/pear for PEAR packages (per #176733) +- add obsoletes to allow upgrade from FE4 PDO packages (#181863) + +* Fri Feb 10 2006 Jesse Keating - 5.1.2-4.3 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 5.1.2-4.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 31 2006 Joe Orton 5.1.2-4 +- rebuild for new libc-client soname + +* Mon Jan 16 2006 Joe Orton 5.1.2-3 +- only build xmlreader and xmlwriter shared (#177810) + +* Fri Jan 13 2006 Joe Orton 5.1.2-2 +- update to 5.1.2 + +* Thu Jan 5 2006 Joe Orton 5.1.1-8 +- rebuild again + +* Mon Jan 2 2006 Joe Orton 5.1.1-7 +- rebuild for new net-snmp + +* Mon Dec 12 2005 Joe Orton 5.1.1-6 +- enable short_open_tag in default php.ini again (#175381) + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Dec 8 2005 Joe Orton 5.1.1-5 +- require net-snmp for php-snmp (#174800) + +* Sun Dec 4 2005 Joe Orton 5.1.1-4 +- add /usr/share/pear back to hard-coded include_path (#174885) + +* Fri Dec 2 2005 Joe Orton 5.1.1-3 +- rebuild for httpd 2.2 + +* Mon Nov 28 2005 Joe Orton 5.1.1-2 +- update to 5.1.1 +- remove pear subpackage +- enable pdo extensions (php-pdo subpackage) +- remove non-standard conditional module builds +- enable xmlreader extension + +* Thu Nov 10 2005 Tomas Mraz 5.0.5-6 +- rebuilt against new openssl + +* Mon Nov 7 2005 Joe Orton 5.0.5-5 +- pear: update to XML_RPC 1.4.4, XML_Parser 1.2.7, Mail 1.1.9 (#172528) + +* Tue Nov 1 2005 Joe Orton 5.0.5-4 +- rebuild for new libnetsnmp + +* Wed Sep 14 2005 Joe Orton 5.0.5-3 +- update to 5.0.5 +- add fix for upstream #34435 +- devel: require autoconf, automake (#159283) +- pear: update to HTTP-1.3.6, Mail-1.1.8, Net_SMTP-1.2.7, XML_RPC-1.4.1 +- fix imagettftext et al (upstream, #161001) + +* Thu Jun 16 2005 Joe Orton 5.0.4-11 +- ldap: restore ldap_start_tls() function + +* Fri May 6 2005 Joe Orton 5.0.4-10 +- disable RPATHs in shared extensions (#156974) + +* Tue May 3 2005 Joe Orton 5.0.4-9 +- build simplexml_import_dom even with shared dom (#156434) +- prevent truncation of copied files to ~2Mb (#155916) +- install /usr/bin/php from CLI build alongside CGI +- enable sysvmsg extension (#142988) + +* Mon Apr 25 2005 Joe Orton 5.0.4-8 +- prevent build of builtin dba as well as shared extension + +* Wed Apr 13 2005 Joe Orton 5.0.4-7 +- split out dba and bcmath extensions into subpackages +- BuildRequire gcc-c++ to avoid AC_PROG_CXX{,CPP} failure (#155221) +- pear: update to DB-1.7.6 +- enable FastCGI support in /usr/bin/php-cgi (#149596) + +* Wed Apr 13 2005 Joe Orton 5.0.4-6 +- build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi, + built with the CGI SAPI (thanks to Edward Rudd, #137704) +- add php(1) man page for CLI +- fix more test cases to use -n when invoking php + +* Wed Apr 13 2005 Joe Orton 5.0.4-5 +- rebuild for new libpq soname + +* Tue Apr 12 2005 Joe Orton 5.0.4-4 +- bundle from PEAR: HTTP, Mail, XML_Parser, Net_Socket, Net_SMTP +- snmp: disable MSHUTDOWN function to prevent error_log noise (#153988) +- mysqli: add fix for crash on x86_64 (Georg Richter, upstream #32282) + +* Mon Apr 11 2005 Joe Orton 5.0.4-3 +- build shared objects as PIC (#154195) + +* Mon Apr 4 2005 Joe Orton 5.0.4-2 +- fix PEAR installation and bundle PEAR DB-1.7.5 package + +* Fri Apr 1 2005 Joe Orton 5.0.4-1 +- update to 5.0.4 (#153068) +- add .phps AddType to php.conf (#152973) +- better gcc4 fix for libxmlrpc + +* Wed Mar 30 2005 Joe Orton 5.0.3-5 +- BuildRequire mysql-devel >= 4.1 +- don't mark php.ini as noreplace to make upgrades work (#152171) +- fix subpackage descriptions (#152628) +- fix memset(,,0) in Zend (thanks to Dave Jones) +- fix various compiler warnings in Zend + +* Thu Mar 24 2005 Joe Orton 5.0.3-4 +- package mysqli extension in php-mysql +- really enable pcntl (#142903) +- don't build with --enable-safe-mode (#148969) +- use "Instant Client" libraries for oci8 module (Kai Bolay, #149873) + +* Fri Feb 18 2005 Joe Orton 5.0.3-3 +- fix build with GCC 4 + +* Wed Feb 9 2005 Joe Orton 5.0.3-2 +- install the ext/gd headers (#145891) +- enable pcntl extension in /usr/bin/php (#142903) +- add libmbfl array arithmetic fix (dcb314@hotmail.com, #143795) +- add BuildRequire for recent pcre-devel (#147448) + +* Wed Jan 12 2005 Joe Orton 5.0.3-1 +- update to 5.0.3 (thanks to Robert Scheck et al, #143101) +- enable xsl extension (#142174) +- package both the xsl and dom extensions in php-xml +- enable soap extension, shared (php-soap package) (#142901) +- add patches from upstream 5.0 branch: + * Zend_strtod.c compile fixes + * correct php_sprintf return value usage + +* Mon Nov 22 2004 Joe Orton 5.0.2-8 +- update for db4-4.3 (Robert Scheck, #140167) +- build against mysql-devel +- run tests in %%check + +* Wed Nov 10 2004 Joe Orton 5.0.2-7 +- truncate changelog at 4.3.1-1 +- merge from 4.3.x package: + - enable mime_magic extension and Require: file (#130276) + +* Mon Nov 8 2004 Joe Orton 5.0.2-6 +- fix dom/sqlite enable/without confusion + +* Mon Nov 8 2004 Joe Orton 5.0.2-5 +- fix phpize installation for lib64 platforms +- add fix for segfault in variable parsing introduced in 5.0.2 + +* Mon Nov 8 2004 Joe Orton 5.0.2-4 +- update to 5.0.2 (#127980) +- build against mysqlclient10-devel +- use new RTLD_DEEPBIND to load extension modules +- drop explicit requirement for elfutils-devel +- use AddHandler in default conf.d/php.conf (#135664) +- "fix" round() fudging for recent gcc on x86 +- disable sqlite pending audit of warnings and subpackage split + +* Fri Sep 17 2004 Joe Orton 5.0.1-4 +- don't build dom extension into 2.0 SAPI + +* Fri Sep 17 2004 Joe Orton 5.0.1-3 +- ExclusiveArch: x86 ppc x86_64 for the moment + +* Fri Sep 17 2004 Joe Orton 5.0.1-2 +- fix default extension_dir and conf.d/php.conf + +* Thu Sep 9 2004 Joe Orton 5.0.1-1 +- update to 5.0.1 +- only build shared modules once +- put dom extension in php-dom subpackage again +- move extension modules into %%{_libdir}/php/modules +- don't use --with-regex=system, it's ignored for the apache* SAPIs + +* Wed Aug 11 2004 Tom Callaway +- Merge in some spec file changes from Jeff Stern (jastern@uci.edu) + +* Mon Aug 09 2004 Tom Callaway +- bump to 5.0.0 +- add patch to prevent clobbering struct re_registers from regex.h +- remove domxml references, replaced with dom now built-in +- fix php.ini to refer to php5 not php4