diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..125a466 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/php-7.2.10.tar.xz diff --git a/.rh-php72-php.metadata b/.rh-php72-php.metadata new file mode 100644 index 0000000..aa4796e --- /dev/null +++ b/.rh-php72-php.metadata @@ -0,0 +1 @@ +ac2d6ae8c332649d2ad9265f0227237f938a9e21 SOURCES/php-7.2.10.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +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/10-opcache.ini b/SOURCES/10-opcache.ini new file mode 100644 index 0000000..1bf3d2a --- /dev/null +++ b/SOURCES/10-opcache.ini @@ -0,0 +1,125 @@ +; Enable Zend OPcache extension module +zend_extension=opcache + +; Determines if Zend OPCache is enabled +opcache.enable=1 + +; Determines if Zend OPCache is enabled for the CLI version of PHP +;opcache.enable_cli=0 + +; The OPcache shared memory storage size. +opcache.memory_consumption=128 + +; The amount of memory for interned strings in Mbytes. +opcache.interned_strings_buffer=8 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 1000000 are allowed. +opcache.max_accelerated_files=4000 + +; The maximum percentage of "wasted" memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. ("1" means validate once per second, but only +; once per request. "0" means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the +; size of the optimized code. +;opcache.save_comments=1 + +; If enabled, a fast shutdown sequence is used for the accelerated code +; Depending on the used Memory Manager this may cause some incompatibilities. +;opcache.fast_shutdown=0 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0xffffffff + +;opcache.inherited_hack=1 +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. +opcache.blacklist_filename=/etc/php.d/opcache*.blacklist + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of "0" means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes "stderr". +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Enables and sets the second level cache directory. +; It should improve performance when SHM memory is full, at server restart or +; SHM reset. The default "" disables file based caching. +; RPM note : file cache 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 +;opcache.file_cache= + +; Enables or disables opcode caching in shared memory. +;opcache.file_cache_only=0 + +; Enables or disables checksum validation when script loaded from file cache. +;opcache.file_cache_consistency_checks=1 + +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + +; Validate cached file permissions. +; Leads OPcache to check file readability on each access to cached file. +; This directive should be enabled in shared hosting environment, when few +; users (PHP-FPM pools) reuse the common OPcache shared memory. +;opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +; This directive prevents file name collisions in different "chroot" +; environments. It should be enabled for sites that may serve requests in +; different "chroot" environments. +;opcache.validate_root=0 diff --git a/SOURCES/macros.php b/SOURCES/macros.php new file mode 100644 index 0000000..3943a74 --- /dev/null +++ b/SOURCES/macros.php @@ -0,0 +1,16 @@ +# +# Interface versions exposed by PHP: +# +%@SCL@php_core_api @PHP_APIVER@ +%@SCL@php_zend_api @PHP_ZENDVER@ +%@SCL@php_pdo_api @PHP_PDOVER@ +%@SCL@php_version @PHP_VERSION@ + +%@SCL@php_extdir @LIBDIR@/php/modules + +%@SCL@php_inidir @ETCDIR@/php.d + +%@SCL@php_incldir @INCDIR@/php + +%@SCL@__php @BINDIR@/php + diff --git a/SOURCES/opcache-default.blacklist b/SOURCES/opcache-default.blacklist new file mode 100644 index 0000000..0cc2e18 --- /dev/null +++ b/SOURCES/opcache-default.blacklist @@ -0,0 +1,11 @@ +; The blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). Line starting with a ; are ignored (comments). +; Files are usually triggered by one of the following three reasons: +; 1) Directories that contain auto generated code, like Smarty or ZFW cache. +; 2) Code that does not work well when accelerated, due to some delayed +; compile time evaluation. +; 3) Code that triggers an OPcache bug. + 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.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.6.3-embed.patch b/SOURCES/php-5.6.3-embed.patch new file mode 100644 index 0000000..d9c04f6 --- /dev/null +++ b/SOURCES/php-5.6.3-embed.patch @@ -0,0 +1,24 @@ +--- php-5.6.3/sapi/embed/config.m4.embed ++++ php-5.6.3/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 -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in +--- php-5.5.30/scripts/php-config.in.old 2015-10-19 15:17:31.944747715 +0200 ++++ php-5.5.30/scripts/php-config.in 2015-10-19 15:17:58.278858083 +0200 +@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" + php_cli_binary=NONE + php_cgi_binary=NONE + configure_options="@CONFIGURE_OPTIONS@" +-php_sapis="@PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@" + + # Set php_cli_binary and php_cgi_binary if available + for sapi in $php_sapis; do diff --git a/SOURCES/php-5.6.3-phpinfo.patch b/SOURCES/php-5.6.3-phpinfo.patch new file mode 100644 index 0000000..086be15 --- /dev/null +++ b/SOURCES/php-5.6.3-phpinfo.patch @@ -0,0 +1,29 @@ + +Drop "Configure Command" from phpinfo as it doesn't +provide any useful information. +The available extensions are not related to this command. + +diff -up php-7.0.0RC1/ext/standard/info.c.phpinfo php-7.0.0RC1/ext/standard/info.c +--- php-7.0.0RC1/ext/standard/info.c.phpinfo 2015-08-18 23:39:24.000000000 +0200 ++++ php-7.0.0RC1/ext/standard/info.c 2015-08-22 07:56:18.344761928 +0200 +@@ -870,9 +870,6 @@ PHPAPI void php_print_info(int flag) + #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 ); +diff -up php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt +--- php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2015-08-18 23:39:22.000000000 +0200 ++++ php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt 2015-08-22 07:56:18.344761928 +0200 +@@ -20,7 +20,6 @@ PHP Version => %s + + 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-7.0.0-oldpcre.patch b/SOURCES/php-7.0.0-oldpcre.patch new file mode 100644 index 0000000..19f8064 --- /dev/null +++ b/SOURCES/php-7.0.0-oldpcre.patch @@ -0,0 +1,20 @@ +diff -up ./ext/pcre/tests/bug37911.phpt.pcre834 ./ext/pcre/tests/bug37911.phpt +--- ./ext/pcre/tests/bug37911.phpt.pcre834 2014-03-26 14:10:18.285452752 +0100 ++++ ./ext/pcre/tests/bug37911.phpt 2014-03-26 14:10:40.028526763 +0100 +@@ -37,5 +37,5 @@ array(3) { + string(4) "blub" + } + +-Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d ++Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line %d + NULL +diff -up ./ext/pcre/tests/match_flags3.phpt.pcre834 ./ext/pcre/tests/match_flags3.phpt +--- ./ext/pcre/tests/match_flags3.phpt.pcre834 2014-03-26 14:06:48.792739665 +0100 ++++ ./ext/pcre/tests/match_flags3.phpt 2014-03-26 14:07:31.820886128 +0100 +@@ -42,5 +42,5 @@ array(1) { + } + } + +-Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d ++Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line %d + bool(false) diff --git a/SOURCES/php-7.0.10-datetests.patch b/SOURCES/php-7.0.10-datetests.patch new file mode 100644 index 0000000..fc42326 --- /dev/null +++ b/SOURCES/php-7.0.10-datetests.patch @@ -0,0 +1,97 @@ +--- a/ext/date/tests/bug66985.phpt 2014-10-30 07:32:03.297693403 +0100 ++++ b/ext/date/tests/bug66985.phpt 2014-10-30 07:32:45.138877977 +0100 +@@ -3,7 +3,7 @@ + --FILE-- + 3 +- [timezone] => Factory +-) +-DateTimeZone Object +-( + [timezone_type] => 3 + [timezone] => GB-Eire + ) +diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt +--- ./ext/date/tests/strtotime3-64bit.phpt.datetests 2016-07-21 02:23:03.000000000 +0200 ++++ ./ext/date/tests/strtotime3-64bit.phpt 2016-07-26 07:39:45.713272263 +0200 +@@ -44,7 +44,7 @@ foreach ($strs as $str) { + } + + ?> +---EXPECT-- ++--EXPECTF-- + bool(false) + bool(false) + string(31) "Thu, 15 Jun 2006 00:00:00 +0100" +@@ -53,7 +53,7 @@ bool(false) + string(31) "Fri, 16 Jun 2006 23:49:12 +0100" + bool(false) + string(31) "Fri, 16 Jun 2006 02:22:00 +0100" +-string(31) "Sun, 16 Jun 0222 02:22:00 -0036" ++string(31) "Sun, 16 Jun 0222 02:22:00 %s" + string(31) "Fri, 16 Jun 2006 02:22:33 +0100" + bool(false) + string(31) "Tue, 02 Mar 2004 00:00:00 +0000" +diff -up ./ext/date/tests/bug33414-2.phpt.old ./ext/date/tests/bug33414-2.phpt +--- ./ext/date/tests/bug33414-2.phpt.old 2017-04-25 15:47:21.675700587 +0200 ++++ ./ext/date/tests/bug33414-2.phpt 2017-04-25 15:57:14.034681111 +0200 +@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid + print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; + print "wanted=Friday 00:00:00\n\n"; + ?> +---EXPECT-- ++--EXPECTF-- + TZ=Pacific/Rarotonga - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -1030 0 +-result=Tuesday 1970-01-06 00:00:00 -1030 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Tuesday 1970-01-06 00:00:00 %s + wanted=Tuesday 00:00:00 + + TZ=Atlantic/South_Georgia - wrong day. +@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1 + wanted=Monday 00:00:00 + + TZ=Pacific/Enderbury - wrong day, off by 2 days. +-tStamp=Thursday 1970-01-01 17:17:17 -12 0 +-result=Monday 1970-01-05 00:00:00 -12 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Monday 1970-01-05 00:00:00 %s + wanted=Monday 00:00:00 + + TZ=Pacific/Kiritimati - wrong day, off by 2 days. +-tStamp=Thursday 1970-01-01 17:17:17 -1040 0 +-result=Monday 1970-01-05 00:00:00 -1040 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Monday 1970-01-05 00:00:00 %s + wanted=Monday 00:00:00 + + TZ=America/Managua - wrong day. +@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1 + wanted=Tuesday 00:00:00 + + TZ=Pacific/Pitcairn - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -0830 0 +-result=Wednesday 1970-01-07 00:00:00 -0830 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Wednesday 1970-01-07 00:00:00 %s + wanted=Wednesday 00:00:00 + + TZ=Pacific/Fakaofo - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -11 0 +-result=Saturday 1970-01-03 00:00:00 -11 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Saturday 1970-01-03 00:00:00 %s + wanted=Saturday 00:00:00 + + TZ=Pacific/Johnston - wrong day. diff --git a/SOURCES/php-7.0.7-curl.patch b/SOURCES/php-7.0.7-curl.patch new file mode 100644 index 0000000..218db98 --- /dev/null +++ b/SOURCES/php-7.0.7-curl.patch @@ -0,0 +1,15 @@ +diff -up php-7.0.7RC1/ext/curl/interface.c.curltls php-7.0.7RC1/ext/curl/interface.c +--- php-7.0.7RC1/ext/curl/interface.c.curltls 2016-05-10 17:28:33.000000000 +0200 ++++ php-7.0.7RC1/ext/curl/interface.c 2016-05-12 07:43:00.900419946 +0200 +@@ -1257,7 +1257,11 @@ PHP_MINIT_FUNCTION(curl) + + #if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ + REGISTER_CURL_CONSTANT(CURLOPT_LOGIN_OPTIONS); ++#endif + ++#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 (in upstream curl 7.34) ++ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136 ++ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */ + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2); diff --git a/SOURCES/php-7.2.0-includedir.patch b/SOURCES/php-7.2.0-includedir.patch new file mode 100644 index 0000000..6d9a871 --- /dev/null +++ b/SOURCES/php-7.2.0-includedir.patch @@ -0,0 +1,11 @@ +--- php-7.2.0/configure.ac.includedir ++++ php-7.2.0/configure.ac +@@ -1230,7 +1230,7 @@ + EXPANDED_DATADIR=$datadir + EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php + + exec_prefix=$old_exec_prefix + libdir=$old_libdir diff --git a/SOURCES/php-7.2.0-libdb.patch b/SOURCES/php-7.2.0-libdb.patch new file mode 100644 index 0000000..ca36d1a --- /dev/null +++ b/SOURCES/php-7.2.0-libdb.patch @@ -0,0 +1,92 @@ +diff -up php-7.2.0alpha0/ext/dba/config.m4.libdb php-7.2.0alpha0/ext/dba/config.m4 +--- php-7.2.0alpha0/ext/dba/config.m4.libdb 2017-05-29 08:56:06.000000000 +0200 ++++ php-7.2.0alpha0/ext/dba/config.m4 2017-05-29 09:13:52.014823282 +0200 +@@ -346,61 +346,13 @@ if test "$PHP_DB4" != "no"; then + dbdp4="/usr/local/BerkeleyDB.4." + dbdp5="/usr/local/BerkeleyDB.5." + for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do +- if test -f "$i/db5/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/db5/db.h +- break +- elif test -f "$i/db4/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/db4/db.h +- break +- elif test -f "$i/include/db5.3/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db5.3/db.h +- break +- elif test -f "$i/include/db5.1/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db5.1/db.h +- break +- elif test -f "$i/include/db5.0/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db5.0/db.h +- break +- elif test -f "$i/include/db4.8/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4.8/db.h +- break +- elif test -f "$i/include/db4.7/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4.7/db.h +- break +- elif test -f "$i/include/db4.6/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4.6/db.h +- break +- elif test -f "$i/include/db4.5/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4.5/db.h +- break +- elif test -f "$i/include/db4/db.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4/db.h +- break +- elif test -f "$i/include/db/db4.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db/db4.h +- break +- elif test -f "$i/include/db4.h"; then +- THIS_PREFIX=$i +- THIS_INCLUDE=$i/include/db4.h +- break +- elif test -f "$i/include/db.h"; then ++ if test -f "$i/include/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db.h + break + fi + done +- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) ++ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + fi + PHP_DBA_STD_RESULT(db4,Berkeley DB4) + +diff -up php-7.2.0alpha0/ext/dba/dba.c.libdb php-7.2.0alpha0/ext/dba/dba.c +--- php-7.2.0alpha0/ext/dba/dba.c.libdb 2017-05-29 09:16:15.736628202 +0200 ++++ php-7.2.0alpha0/ext/dba/dba.c 2017-05-29 09:16:20.494654746 +0200 +@@ -53,6 +53,10 @@ + #include "php_tcadb.h" + #include "php_lmdb.h" + ++#ifdef DB4_INCLUDE_FILE ++#include DB4_INCLUDE_FILE ++#endif ++ + /* {{{ arginfo */ + ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) + ZEND_ARG_INFO(0, path) +@@ -558,6 +562,10 @@ PHP_MINFO_FUNCTION(dba) + + php_info_print_table_start(); + php_info_print_table_row(2, "DBA support", "enabled"); ++#ifdef DB_VERSION_STRING ++ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); ++ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); ++#endif + if (handlers.s) { + smart_str_0(&handlers); + php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); diff --git a/SOURCES/php-7.2.10-fileinfo.patch b/SOURCES/php-7.2.10-fileinfo.patch new file mode 100644 index 0000000..16e107d --- /dev/null +++ b/SOURCES/php-7.2.10-fileinfo.patch @@ -0,0 +1,119 @@ +From c621182c42a36975970586cfc294bc5a80ba08cb Mon Sep 17 00:00:00 2001 +From: Anatol Belski +Date: Sun, 4 Nov 2018 16:56:43 +0100 +Subject: [PATCH] Backport 7f5f4601 for 7.2 + +--- + ext/fileinfo/libmagic/apprentice.c | 7 ++++--- + ext/fileinfo/libmagic/softmagic.c | 31 ++++++++++++------------------ + 2 files changed, 16 insertions(+), 22 deletions(-) + +diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c +index e55f59bbb8c5..fae2abb811d5 100644 +--- a/ext/fileinfo/libmagic/apprentice.c ++++ b/ext/fileinfo/libmagic/apprentice.c +@@ -2524,18 +2524,19 @@ getvalue(struct magic_set *ms, struct magic *m, const char **p, int action) + return -1; + } + if (m->type == FILE_REGEX) { +- /* XXX do we need this? */ +- /*zval pattern; ++ zval pattern; + int options = 0; + pcre_cache_entry *pce; + + convert_libmagic_pattern(&pattern, m->value.s, strlen(m->value.s), options); + + if ((pce = pcre_get_compiled_regex_cache(Z_STR(pattern))) == NULL) { ++ zval_dtor(&pattern); + return -1; + } ++ zval_dtor(&pattern); + +- return 0;*/ ++ return 0; + } + return 0; + case FILE_FLOAT: +diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c +index d07d49e7a016..4b10e846644f 100644 +--- a/ext/fileinfo/libmagic/softmagic.c ++++ b/ext/fileinfo/libmagic/softmagic.c +@@ -1203,28 +1203,21 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir, + return 0; + } + +- /* bytecnt checks are to be kept for PHP, see cve-2014-3538. +- PCRE might get stuck if the input buffer is too big. */ +- linecnt = m->str_range; +- bytecnt = linecnt * 80; +- +- if (bytecnt == 0) { +- bytecnt = 1 << 14; ++ if (m->str_flags & REGEX_LINE_COUNT) { ++ linecnt = m->str_range; ++ bytecnt = linecnt * 80; ++ } else { ++ linecnt = 0; ++ bytecnt = m->str_range; + } + +- if (bytecnt > nbytes) { +- bytecnt = nbytes; +- } +- if (offset > bytecnt) { +- offset = bytecnt; +- } +- if (s == NULL) { +- ms->search.s_len = 0; +- ms->search.s = NULL; +- return 0; +- } ++ if (bytecnt == 0 || bytecnt > nbytes - offset) ++ bytecnt = nbytes - offset; ++ if (bytecnt > ms->regex_max) ++ bytecnt = ms->regex_max; ++ + buf = RCAST(const char *, s) + offset; +- end = last = RCAST(const char *, s) + bytecnt; ++ end = last = RCAST(const char *, s) + bytecnt + offset; + /* mget() guarantees buf <= last */ + for (lines = linecnt, b = buf; lines && b < end && + ((b = CAST(const char *, +From 0e33c2822c913e7cb0d9d04b08d3d9439bda6e4c Mon Sep 17 00:00:00 2001 +From: Anatol Belski +Date: Mon, 5 Nov 2018 21:28:04 +0100 +Subject: [PATCH] Declare function proto in header + +--- + ext/fileinfo/libmagic/file.h | 3 +++ + ext/fileinfo/libmagic/funcs.c | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ext/fileinfo/libmagic/file.h b/ext/fileinfo/libmagic/file.h +index bfc49f57d5d8..cb9bd87293f2 100644 +--- a/ext/fileinfo/libmagic/file.h ++++ b/ext/fileinfo/libmagic/file.h +@@ -488,6 +488,9 @@ protected int file_os2_apptype(struct magic_set *, const char *, const void *, + size_t); + #endif /* __EMX__ */ + ++public void ++convert_libmagic_pattern(zval *pattern, char *val, int len, int options); ++ + typedef struct { + char *buf; + uint32_t offset; +diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c +index 40ea81d3df39..f49129e7d80b 100644 +--- a/ext/fileinfo/libmagic/funcs.c ++++ b/ext/fileinfo/libmagic/funcs.c +@@ -56,8 +56,6 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.92 2017/04/07 20:10:24 christos Exp $") + # define PREG_OFFSET_CAPTURE (1<<8) + #endif + +-extern public void convert_libmagic_pattern(zval *pattern, char *val, int len, int options); +- + protected int + file_printf(struct magic_set *ms, const char *fmt, ...) + { diff --git a/SOURCES/php-7.2.10-mysql8.patch b/SOURCES/php-7.2.10-mysql8.patch new file mode 100644 index 0000000..d82cfe7 --- /dev/null +++ b/SOURCES/php-7.2.10-mysql8.patch @@ -0,0 +1,676 @@ +From 03740ef7dffcc80530a89ebde3ccf5464f7f18e6 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Tue, 4 Sep 2018 05:45:45 +0200 +Subject: [PATCH] Revert all MySQL auth related changes + +Per bug #76651 these changes do not appear to work correctly in +some cases. As no immediate fix seems to be forthcoming, I'm +reverting these changes. + +Revert "Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)" + +This reverts commit 11507c0e1bfa17a96480f3648397f6975c31551e. + +Revert "Fix mysqlnd build without openssl" + +This reverts commit 6c9db02ff7812c298d1e7e292ba731d9d3a66790. + +Revert "Fix VC compilation as variable size array is not supported" + +This reverts commit f96df64cb2219fda42ca875483f874cf3052647c. + +Revert "Fix MySQL 8 auth" + +This reverts commit d6e81f0bfd0cb90586dd83d4fd47a4302605261a. +--- + ext/mysqlnd/mysqlnd_auth.c | 293 +---------------------------- + ext/mysqlnd/mysqlnd_auth.h | 23 ++- + ext/mysqlnd/mysqlnd_connection.c | 4 - + ext/mysqlnd/mysqlnd_enum_n_def.h | 1 - + ext/mysqlnd/mysqlnd_structs.h | 10 - + ext/mysqlnd/mysqlnd_wireprotocol.c | 113 +---------- + ext/mysqlnd/mysqlnd_wireprotocol.h | 10 - + 7 files changed, 29 insertions(+), 425 deletions(-) + +diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c +index 66e93cf63669..3ba447cfdf91 100644 +--- a/ext/mysqlnd/mysqlnd_auth.c ++++ b/ext/mysqlnd/mysqlnd_auth.c +@@ -89,7 +89,6 @@ mysqlnd_run_authentication( + } + } + +- + { + zend_uchar * switch_to_auth_protocol_data = NULL; + size_t switch_to_auth_protocol_data_len = 0; +@@ -114,11 +113,10 @@ mysqlnd_run_authentication( + DBG_INF_FMT("salt(%d)=[%.*s]", plugin_data_len, plugin_data_len, plugin_data); + /* The data should be allocated with malloc() */ + if (auth_plugin) { +- scrambled_data = auth_plugin->methods.get_auth_data( +- NULL, &scrambled_data_len, conn, user, passwd, +- passwd_len, plugin_data, plugin_data_len, +- session_options, conn->protocol_frame_codec->data, +- mysql_flags); ++ scrambled_data = ++ auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len, ++ plugin_data, plugin_data_len, session_options, ++ conn->protocol_frame_codec->data, mysql_flags); + } + + if (conn->error_info->error_no) { +@@ -129,7 +127,6 @@ mysqlnd_run_authentication( + charset_no, + first_call, + requested_protocol, +- auth_plugin, plugin_data, plugin_data_len, + scrambled_data, scrambled_data_len, + &switch_to_auth_protocol, &switch_to_auth_protocol_len, + &switch_to_auth_protocol_data, &switch_to_auth_protocol_data_len +@@ -251,9 +248,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +@@ -324,11 +318,6 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no); + } + +- if (auth_plugin && auth_plugin->methods.handle_server_response) { +- auth_plugin->methods.handle_server_response(auth_plugin, conn, +- orig_auth_plugin_data, orig_auth_plugin_data_len, passwd, passwd_len); +- } +- + if (FAIL == PACKET_READ(auth_resp_packet) || auth_resp_packet->response_code >= 0xFE) { + if (auth_resp_packet->response_code == 0xFE) { + /* old authentication with new server !*/ +@@ -624,8 +613,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_native_auth_plugin = + } + }, + {/* methods */ +- mysqlnd_native_auth_get_auth_data, +- NULL ++ mysqlnd_native_auth_get_auth_data + } + }; + +@@ -674,8 +662,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_pam_authentication_plugin + } + }, + {/* methods */ +- mysqlnd_pam_auth_get_auth_data, +- NULL ++ mysqlnd_pam_auth_get_auth_data + } + }; + +@@ -859,283 +846,17 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_sha256_authentication_plu + } + }, + {/* methods */ +- mysqlnd_sha256_auth_get_auth_data, +- NULL ++ mysqlnd_sha256_auth_get_auth_data + } + }; + #endif + +-/*************************************** CACHING SHA2 Password *******************************/ +- +-#undef L64 +- +-#include "ext/hash/php_hash.h" +-#include "ext/hash/php_hash_sha.h" +- +-#define SHA256_LENGTH 32 +- +-/* {{{ php_mysqlnd_scramble_sha2 */ +-void php_mysqlnd_scramble_sha2(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const password, const size_t password_len) +-{ +- PHP_SHA256_CTX context; +- zend_uchar sha1[SHA256_LENGTH]; +- zend_uchar sha2[SHA256_LENGTH]; +- +- /* Phase 1: hash password */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, password, password_len); +- PHP_SHA256Final(sha1, &context); +- +- /* Phase 2: hash sha1 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha1, SHA256_LENGTH); +- PHP_SHA256Final(sha2, &context); +- +- /* Phase 3: hash scramble + sha2 */ +- PHP_SHA256Init(&context); +- PHP_SHA256Update(&context, (zend_uchar*)sha2, SHA256_LENGTH); +- PHP_SHA256Update(&context, scramble, SCRAMBLE_LENGTH); +- PHP_SHA256Final(buffer, &context); +- +- /* let's crypt buffer now */ +- php_mysqlnd_crypt(buffer, (const zend_uchar *)sha1, (const zend_uchar *)buffer, SHA256_LENGTH); +-} +-/* }}} */ +- +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static zend_uchar * +-mysqlnd_caching_sha2_get_auth_data(struct st_mysqlnd_authentication_plugin * self, +- size_t * auth_data_len, +- MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, +- const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const MYSQLND_SESSION_OPTIONS * const session_options, +- const MYSQLND_PFC_DATA * const pfc_data, +- zend_ulong mysql_flags +- ) +-{ +- zend_uchar * ret = NULL; +- DBG_ENTER("mysqlnd_caching_sha2_get_auth_data"); +- DBG_INF_FMT("salt(%d)=[%.*s]", auth_plugin_data_len, auth_plugin_data_len, auth_plugin_data); +- *auth_data_len = 0; +- +- DBG_INF("First auth step: send hashed password"); +- /* copy scrambled pass*/ +- if (passwd && passwd_len) { +- ret = malloc(SHA256_LENGTH + 1); +- *auth_data_len = SHA256_LENGTH; +- php_mysqlnd_scramble_sha2((zend_uchar*)ret, auth_plugin_data, (zend_uchar*)passwd, passwd_len); +- ret[SHA256_LENGTH] = '\0'; +- DBG_INF_FMT("hash(%d)=[%.*s]", *auth_data_len, *auth_data_len, ret); +- } +- +- DBG_RETURN(ret); +-} +-/* }}} */ +- +-#ifdef MYSQLND_HAVE_SSL +-static RSA * +-mysqlnd_caching_sha2_get_key(MYSQLND_CONN_DATA *conn) +-{ +- RSA * ret = NULL; +- const MYSQLND_PFC_DATA * const pfc_data = conn->protocol_frame_codec->data; +- const char * fname = (pfc_data->sha256_server_public_key && pfc_data->sha256_server_public_key[0] != '\0')? +- pfc_data->sha256_server_public_key: +- MYSQLND_G(sha256_server_public_key); +- php_stream * stream; +- DBG_ENTER("mysqlnd_cached_sha2_get_key"); +- DBG_INF_FMT("options_s256_pk=[%s] MYSQLND_G(sha256_server_public_key)=[%s]", +- pfc_data->sha256_server_public_key? pfc_data->sha256_server_public_key:"n/a", +- MYSQLND_G(sha256_server_public_key)? MYSQLND_G(sha256_server_public_key):"n/a"); +- if (!fname || fname[0] == '\0') { +- MYSQLND_PACKET_CACHED_SHA2_RESULT *req_packet = NULL; +- MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE *pk_resp_packet = NULL; +- +- do { +- DBG_INF("requesting the public key from the server"); +- req_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- pk_resp_packet = conn->payload_decoder_factory->m.get_sha256_pk_request_response_packet(conn->payload_decoder_factory, FALSE); +- req_packet->request = 1; +- +- if (! PACKET_WRITE(req_packet)) { +- DBG_ERR_FMT("Error while sending public key request packet"); +- php_error(E_WARNING, "Error while sending public key request packet. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- if (FAIL == PACKET_READ(pk_resp_packet) || NULL == pk_resp_packet->public_key) { +- DBG_ERR_FMT("Error while receiving public key"); +- php_error(E_WARNING, "Error while receiving public key. PID=%d", getpid()); +- SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); +- break; +- } +- DBG_INF_FMT("Public key(%d):\n%s", pk_resp_packet->public_key_len, pk_resp_packet->public_key); +- /* now extract the public key */ +- { +- BIO * bio = BIO_new_mem_buf(pk_resp_packet->public_key, pk_resp_packet->public_key_len); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- } +- } while (0); +- PACKET_FREE(req_packet); +- PACKET_FREE(pk_resp_packet); +- +- DBG_INF_FMT("ret=%p", ret); +- DBG_RETURN(ret); +- +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, +- "caching_sha2_server_public_key is not set for the connection or as mysqlnd.sha256_server_public_key"); +- DBG_ERR("server_public_key is not set"); +- DBG_RETURN(NULL); +- } else { +- zend_string * key_str; +- DBG_INF_FMT("Key in a file. [%s]", fname); +- stream = php_stream_open_wrapper((char *) fname, "rb", REPORT_ERRORS, NULL); +- +- if (stream) { +- if ((key_str = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0)) != NULL) { +- BIO * bio = BIO_new_mem_buf(ZSTR_VAL(key_str), ZSTR_LEN(key_str)); +- ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); +- BIO_free(bio); +- DBG_INF("Successfully loaded"); +- DBG_INF_FMT("Public key:%*.s", ZSTR_LEN(key_str), ZSTR_VAL(key_str)); +- zend_string_release(key_str); +- } +- php_stream_close(stream); +- } +- } +- DBG_RETURN(ret); +- +-} +-#endif +- +- +-/* {{{ mysqlnd_caching_sha2_get_key */ +-static size_t +-mysqlnd_caching_sha2_get_and_use_key(MYSQLND_CONN_DATA *conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- unsigned char **crypted, +- const char * const passwd, +- const size_t passwd_len) +-{ +-#ifdef MYSQLND_HAVE_SSL +- static RSA *server_public_key; +- server_public_key = mysqlnd_caching_sha2_get_key(conn); +- +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- +- if (server_public_key) { +- int server_public_key_len; +- char xor_str[passwd_len + 1]; +- memcpy(xor_str, passwd, passwd_len); +- xor_str[passwd_len] = '\0'; +- mysqlnd_xor_string(xor_str, passwd_len, (char *) auth_plugin_data, auth_plugin_data_len); +- +- server_public_key_len = RSA_size(server_public_key); +- /* +- Because RSA_PKCS1_OAEP_PADDING is used there is a restriction on the passwd_len. +- RSA_PKCS1_OAEP_PADDING is recommended for new applications. See more here: +- http://www.openssl.org/docs/crypto/RSA_public_encrypt.html +- */ +- if ((size_t) server_public_key_len - 41 <= passwd_len) { +- /* password message is to long */ +- SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "password is too long"); +- DBG_ERR("password is too long"); +- DBG_RETURN(0); +- } +- +- *crypted = emalloc(server_public_key_len); +- RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, *crypted, server_public_key, RSA_PKCS1_OAEP_PADDING); +- DBG_RETURN(server_public_key_len); +- } +- DBG_RETURN(0); +-#else +- DBG_ENTER("mysqlnd_caching_sha2_get_and_use_key("); +- php_error_docref(NULL, E_WARNING, "PHP was built without openssl extension, can't send password encrypted"); +- DBG_RETURN(0); +-#endif +-} +-/* }}} */ +- +-/* {{{ mysqlnd_native_auth_get_auth_data */ +-static void +-mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plugin *self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len) +-{ +- DBG_ENTER("mysqlnd_caching_sha2_handle_server_response"); +- MYSQLND_PACKET_CACHED_SHA2_RESULT *result_packet; +- result_packet = conn->payload_decoder_factory->m.get_cached_sha2_result_packet(conn->payload_decoder_factory, FALSE); +- +- if (FAIL == PACKET_READ(result_packet)) { +- DBG_VOID_RETURN; +- } +- +- switch (result_packet->response_code) { +- case 3: +- DBG_INF("fast path suceeded"); +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 4: +- if (conn->vio->data->ssl || conn->unix_socket.s) { +- DBG_INF("fast path failed, doing full auth via SSL"); +- result_packet->password = (zend_uchar *)passwd; +- result_packet->password_len = passwd_len + 1; +- PACKET_WRITE(result_packet); +- } else { +- DBG_INF("fast path failed, doing full auth without SSL"); +- result_packet->password_len = mysqlnd_caching_sha2_get_and_use_key(conn, auth_plugin_data, auth_plugin_data_len, &result_packet->password, passwd, passwd_len); +- PACKET_WRITE(result_packet); +- efree(result_packet->password); +- } +- PACKET_FREE(result_packet); +- DBG_VOID_RETURN; +- case 2: +- // The server tried to send a key, which we didn't expect +- // fall-through +- default: +- php_error_docref(NULL, E_WARNING, "Unexpected server respose while doing caching_sha2 auth: %i", result_packet->response_code); +- } +- +- PACKET_FREE(result_packet); +- +- DBG_VOID_RETURN; +-} +-/* }}} */ +- +-static struct st_mysqlnd_authentication_plugin mysqlnd_caching_sha2_auth_plugin = +-{ +- { +- MYSQLND_PLUGIN_API_VERSION, +- "auth_plugin_caching_sha2_password", +- MYSQLND_VERSION_ID, +- PHP_MYSQLND_VERSION, +- "PHP License 3.01", +- "Johannes Schlüter ", +- { +- NULL, /* no statistics , will be filled later if there are some */ +- NULL, /* no statistics */ +- }, +- { +- NULL /* plugin shutdown */ +- } +- }, +- {/* methods */ +- mysqlnd_caching_sha2_get_auth_data, +- mysqlnd_caching_sha2_handle_server_response +- } +-}; +- +- + /* {{{ mysqlnd_register_builtin_authentication_plugins */ + void + mysqlnd_register_builtin_authentication_plugins(void) + { + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_native_auth_plugin); + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_pam_authentication_plugin); +- mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_caching_sha2_auth_plugin); + #ifdef MYSQLND_HAVE_SSL + mysqlnd_plugin_register_ex((struct st_mysqlnd_plugin_header *) &mysqlnd_sha256_authentication_plugin); + #endif +diff --git a/ext/mysqlnd/mysqlnd_auth.h b/ext/mysqlnd/mysqlnd_auth.h +index 3ddb5a5f70fe..8fc369abca43 100644 +--- a/ext/mysqlnd/mysqlnd_auth.h ++++ b/ext/mysqlnd/mysqlnd_auth.h +@@ -31,9 +31,26 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, + unsigned int server_charset_no, + zend_bool use_full_blown_auth_packet, + const char * const auth_protocol, +- struct st_mysqlnd_authentication_plugin * auth_plugin, +- const zend_uchar * const orig_auth_plugin_data, +- const size_t orig_auth_plugin_data_len, ++ const zend_uchar * const auth_plugin_data, ++ const size_t auth_plugin_data_len, ++ char ** switch_to_auth_protocol, ++ size_t * switch_to_auth_protocol_len, ++ zend_uchar ** switch_to_auth_protocol_data, ++ size_t * switch_to_auth_protocol_data_len ++ ); ++ ++enum_func_status ++mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, ++ const char * const user, ++ const char * const passwd, ++ const size_t passwd_len, ++ const char * const db, ++ const size_t db_len, ++ const MYSQLND_SESSION_OPTIONS * const session_options, ++ zend_ulong mysql_flags, ++ unsigned int server_charset_no, ++ zend_bool use_full_blown_auth_packet, ++ const char * const auth_protocol, + const zend_uchar * const auth_plugin_data, + const size_t auth_plugin_data_len, + char ** switch_to_auth_protocol, +diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c +index 2f458149a6cd..654673f500c0 100644 +--- a/ext/mysqlnd/mysqlnd_connection.c ++++ b/ext/mysqlnd/mysqlnd_connection.c +@@ -678,13 +678,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, + + { + const MYSQLND_CSTRING scheme = { transport.s, transport.l }; +- /* This will be overwritten below with a copy, but we can use it during authentication */ +- conn->unix_socket.s = (char *)socket_or_pipe.s; + if (FAIL == conn->m->connect_handshake(conn, &scheme, &username, &password, &database, mysql_flags)) { +- conn->unix_socket.s = NULL; + goto err; + } +- conn->unix_socket.s = NULL; + } + + { +diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h +index 0a3022058d1d..4b3ae4fff36f 100644 +--- a/ext/mysqlnd/mysqlnd_enum_n_def.h ++++ b/ext/mysqlnd/mysqlnd_enum_n_def.h +@@ -618,7 +618,6 @@ enum mysqlnd_packet_type + PROT_CHG_USER_RESP_PACKET, + PROT_SHA256_PK_REQUEST_PACKET, + PROT_SHA256_PK_REQUEST_RESPONSE_PACKET, +- PROT_CACHED_SHA2_RESULT_PACKET, + PROT_LAST /* should always be last */ + }; + +diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h +index bd09b5b0dffd..81b24066460a 100644 +--- a/ext/mysqlnd/mysqlnd_structs.h ++++ b/ext/mysqlnd/mysqlnd_structs.h +@@ -970,7 +970,6 @@ struct st_mysqlnd_packet_chg_user_resp; + struct st_mysqlnd_packet_auth_pam; + struct st_mysqlnd_packet_sha256_pk_request; + struct st_mysqlnd_packet_sha256_pk_request_response; +-struct st_mysqlnd_packet_cached_sha2_result; + + typedef struct st_mysqlnd_packet_greet * (*func_mysqlnd_protocol_payload_decoder_factory__get_greet_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_auth * (*func_mysqlnd_protocol_payload_decoder_factory__get_auth_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +@@ -987,7 +986,6 @@ typedef struct st_mysqlnd_packet_prepare_response *(*func_mysqlnd_protocol_paylo + typedef struct st_mysqlnd_packet_chg_user_resp*(*func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + typedef struct st_mysqlnd_packet_sha256_pk_request_response *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); +-typedef struct st_mysqlnd_packet_cached_sha2_result *(*func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent); + + typedef enum_func_status (*func_mysqlnd_protocol_payload_decoder_factory__send_command)( + MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory, +@@ -1045,7 +1043,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) + func_mysqlnd_protocol_payload_decoder_factory__get_change_user_response_packet get_change_user_response_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet get_sha256_pk_request_packet; + func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet get_sha256_pk_request_response_packet; +- func_mysqlnd_protocol_payload_decoder_factory__get_cached_sha2_result_packet get_cached_sha2_result_packet; + + func_mysqlnd_protocol_payload_decoder_factory__send_command send_command; + func_mysqlnd_protocol_payload_decoder_factory__send_command_handle_response send_command_handle_response; +@@ -1358,18 +1355,11 @@ typedef zend_uchar * (*func_auth_plugin__get_auth_data)(struct st_mysqlnd_authen + const MYSQLND_PFC_DATA * const pfc_data, zend_ulong mysql_flags + ); + +-typedef void (*func_auth_plugin__handle_server_response)(struct st_mysqlnd_authentication_plugin * self, +- MYSQLND_CONN_DATA * conn, +- const zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, +- const char * const passwd, +- const size_t passwd_len); +- + struct st_mysqlnd_authentication_plugin + { + struct st_mysqlnd_plugin_header plugin_header; + struct { + func_auth_plugin__get_auth_data get_auth_data; +- func_auth_plugin__handle_server_response handle_server_response; + } methods; + }; + +diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c +index c5039c3d722e..29f89e88e052 100644 +--- a/ext/mysqlnd/mysqlnd_wireprotocol.c ++++ b/ext/mysqlnd/mysqlnd_wireprotocol.c +@@ -2269,85 +2269,7 @@ php_mysqlnd_sha256_pk_request_response_free_mem(void * _packet, zend_bool stack_ + } + /* }}} */ + +-static +-size_t php_mysqlnd_cached_sha2_result_write(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +-#ifndef _MSC_VER +- zend_uchar buffer[MYSQLND_HEADER_SIZE + packet->password_len + 1]; +-#else +- ALLOCA_FLAG(use_heap) +- zend_uchar *buffer = do_alloca(MYSQLND_HEADER_SIZE + packet->password_len + 1, use_heap); +-#endif +- size_t sent; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_write"); +- +- if (packet->request == 1) { +- int1store(buffer + MYSQLND_HEADER_SIZE, '\2'); +- sent = pfc->data->m.send(pfc, vio, buffer, 1, stats, error_info); +- } else { +- memcpy(buffer + MYSQLND_HEADER_SIZE, packet->password, packet->password_len); +- sent = pfc->data->m.send(pfc, vio, buffer, packet->password_len, stats, error_info); +- } +- +-#ifdef _MSC_VER +- free_alloca(buffer, use_heap); +-#endif +- +- DBG_RETURN(sent); +-} +- +-static enum_func_status +-php_mysqlnd_cached_sha2_result_read(void * _packet) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * packet= (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- MYSQLND_ERROR_INFO * error_info = packet->header.error_info; +- MYSQLND_PFC * pfc = packet->header.protocol_frame_codec; +- MYSQLND_VIO * vio = packet->header.vio; +- MYSQLND_STATS * stats = packet->header.stats; +- MYSQLND_CONNECTION_STATE * connection_state = packet->header.connection_state; +- zend_uchar buf[SHA256_PK_REQUEST_RESP_BUFFER_SIZE]; +- zend_uchar *p = buf; +- const zend_uchar * const begin = buf; +- +- DBG_ENTER("php_mysqlnd_cached_sha2_result_read"); +- if (FAIL == mysqlnd_read_packet_header_and_body(&(packet->header), pfc, vio, stats, error_info, connection_state, buf, sizeof(buf), "PROT_CACHED_SHA2_RESULT_PACKET", PROT_CACHED_SHA2_RESULT_PACKET)) { +- DBG_RETURN(FAIL); +- } +- BAIL_IF_NO_MORE_DATA; +- +- p++; +- packet->response_code = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; + +- p++; +- packet->result = uint1korr(p); +- BAIL_IF_NO_MORE_DATA; +- +- DBG_RETURN(PASS); +- +-premature_end: +- DBG_ERR_FMT("OK packet %d bytes shorter than expected", p - begin - packet->header.size); +- php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet "MYSQLND_SZ_T_SPEC" bytes shorter than expected", +- p - begin - packet->header.size); +- DBG_RETURN(FAIL); +-} +- +-static void +-php_mysqlnd_cached_sha2_result_free_mem(void * _packet, zend_bool stack_allocation) +-{ +- MYSQLND_PACKET_CACHED_SHA2_RESULT * p = (MYSQLND_PACKET_CACHED_SHA2_RESULT *) _packet; +- +- if (!stack_allocation) { +- mnd_pefree(p, p->header.persistent); +- } +-} +-/* }}} */ + /* {{{ packet_methods */ + static + mysqlnd_packet_methods packet_methods[PROT_LAST] = +@@ -2441,15 +2363,9 @@ mysqlnd_packet_methods packet_methods[PROT_LAST] = + php_mysqlnd_sha256_pk_request_response_read, + NULL, /* write */ + php_mysqlnd_sha256_pk_request_response_free_mem, +- }, /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ +- { +- sizeof(MYSQLND_PACKET_CACHED_SHA2_RESULT), +- php_mysqlnd_cached_sha2_result_read, +- php_mysqlnd_cached_sha2_result_write, +- php_mysqlnd_cached_sha2_result_free_mem +- } /* PROT_CACHED_SHA2_RESULT_PACKET */ ++ } /* PROT_SHA256_PK_REQUEST_RESPONSE_PACKET */ + }; +-/* }}} */ ++/* }}} */ + + + /* {{{ mysqlnd_protocol::get_greet_packet */ +@@ -2798,30 +2714,6 @@ MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet)(MYSQLND_ + } + /* }}} */ + +-/* {{{ mysqlnd_protocol::init_cached_sha2_result_packet */ +-static struct st_mysqlnd_packet_cached_sha2_result * +-MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet) +-(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, const zend_bool persistent) +-{ +- struct st_mysqlnd_packet_cached_sha2_result * packet = mnd_pecalloc(1, packet_methods[PROT_CACHED_SHA2_RESULT_PACKET].struct_size, persistent); +- DBG_ENTER("mysqlnd_protocol::init_cached_sha2_result_packet"); +- if (packet) { +- memset(packet, 0, sizeof(*packet)); +- packet->header.m = &packet_methods[PROT_CACHED_SHA2_RESULT_PACKET]; +- packet->header.factory = factory; +- +- packet->header.protocol_frame_codec = factory->conn->protocol_frame_codec; +- packet->header.vio = factory->conn->vio; +- packet->header.stats = factory->conn->stats; +- packet->header.error_info = factory->conn->error_info; +- packet->header.connection_state = &factory->conn->state; +- +- packet->header.persistent = persistent; +- } +- DBG_RETURN(packet); +-} +-/* }}} */ +- + + /* {{{ mysqlnd_protocol::send_command */ + static enum_func_status +@@ -3052,7 +2944,6 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_protocol_payload_decoder_factory) + MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_packet), + MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet), +- MYSQLND_METHOD(mysqlnd_protocol, get_cached_sha2_result_packet), + + MYSQLND_METHOD(mysqlnd_protocol, send_command), + MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response), +diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h +index c749afeb75f5..d6855580b4e0 100644 +--- a/ext/mysqlnd/mysqlnd_wireprotocol.h ++++ b/ext/mysqlnd/mysqlnd_wireprotocol.h +@@ -292,16 +292,6 @@ typedef struct st_mysqlnd_packet_sha256_pk_request_response { + size_t public_key_len; + } MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE; + +-typedef struct st_mysqlnd_packet_cached_sha2_result { +- MYSQLND_PACKET_HEADER header; +- uint8_t response_code; +- uint8_t result; +- uint8_t request; +- zend_uchar * password; +- size_t password_len; +-} MYSQLND_PACKET_CACHED_SHA2_RESULT; +- +- + + zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); + zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); diff --git a/SOURCES/php-7.2.3-ldap_r.patch b/SOURCES/php-7.2.3-ldap_r.patch new file mode 100644 index 0000000..5e947cf --- /dev/null +++ b/SOURCES/php-7.2.3-ldap_r.patch @@ -0,0 +1,19 @@ + +Use -lldap_r by default. + +diff -up php-7.2.3RC1/ext/ldap/config.m4.ldap_r php-7.2.3RC1/ext/ldap/config.m4 +--- php-7.2.3RC1/ext/ldap/config.m4.ldap_r 2018-02-14 06:05:11.553142812 +0100 ++++ php-7.2.3RC1/ext/ldap/config.m4 2018-02-14 06:07:31.179816122 +0100 +@@ -119,7 +119,11 @@ if test "$PHP_LDAP" != "no"; then + + MACHINE_INCLUDES=$($CC -dumpmachine) + +- if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then ++ if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then ++ PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) ++ ++ elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then + PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) + diff --git a/SOURCES/php-7.2.3-systzdata-v16.patch b/SOURCES/php-7.2.3-systzdata-v16.patch new file mode 100644 index 0000000..e488beb --- /dev/null +++ b/SOURCES/php-7.2.3-systzdata-v16.patch @@ -0,0 +1,654 @@ +# License: MIT +# http://opensource.org/licenses/MIT + +Add support for use of the system timezone database, rather +than embedding a copy. Discussed upstream but was not desired. + +History: +r16: adapt for timelib 2017.06 (in 7.2.3RC1) +r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) +r14: improve check for valid tz file +r13: adapt for upstream changes to use PHP allocator +r12: adapt for upstream changes for new zic +r11: use canonical names to avoid more case sensitivity issues + round lat/long from zone.tab towards zero per builtin db +r10: make timezone case insensitive +r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold) +r8: fix compile error without --with-system-tzdata configured +r7: improve check for valid timezone id to exclude directories +r6: fix fd leak in r5, fix country code/BC flag use in + timezone_identifiers_list() using system db, + fix use of PECL timezonedb to override system db, +r5: reverts addition of "System/Localtime" fake tzname. + updated for 5.3.0, parses zone.tab to pick up mapping between + timezone name, country code and long/lat coords +r4: added "System/Localtime" tzname which uses /etc/localtime +r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) +r2: add filesystem trawl to set up name alias index +r1: initial revision + +diff -up php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.3RC1/ext/date/lib/parse_tz.c +--- php-7.2.3RC1/ext/date/lib/parse_tz.c.systzdata 2018-02-13 20:18:34.000000000 +0100 ++++ php-7.2.3RC1/ext/date/lib/parse_tz.c 2018-02-14 06:14:23.484804852 +0100 +@@ -25,8 +25,21 @@ + #include "timelib.h" + #include "timelib_private.h" + ++#ifdef HAVE_SYSTEM_TZDATA ++#include ++#include ++#include ++#include ++#include ++ ++#include "php_scandir.h" ++ ++#else + #define TIMELIB_SUPPORTS_V2DATA + #include "timezonedb.h" ++#endif ++ ++#include + + #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) + # if defined(__LITTLE_ENDIAN__) +@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig + { + uint32_t version; + ++ if (memcmp(*tzf, "TZif", 4) == 0) { ++ *tzf += 20; ++ return 0; ++ } ++ + /* read ID */ + version = (*tzf)[3] - '0'; + *tzf += 4; +@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo + } + } + +-static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++#ifdef HAVE_SYSTEM_TZDATA ++ ++#ifdef HAVE_SYSTEM_TZDATA_PREFIX ++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX ++#else ++#define ZONEINFO_PREFIX "/usr/share/zoneinfo" ++#endif ++ ++/* System timezone database pointer. */ ++static const timelib_tzdb *timezonedb_system; ++ ++/* Hash table entry for the cache of the zone.tab mapping table. */ ++struct location_info { ++ char code[2]; ++ double latitude, longitude; ++ char name[64]; ++ char *comment; ++ struct location_info *next; ++}; ++ ++/* Cache of zone.tab. */ ++static struct location_info **system_location_table; ++ ++/* Size of the zone.tab hash table; a random-ish prime big enough to ++ * prevent too many collisions. */ ++#define LOCINFO_HASH_SIZE (1021) ++ ++/* Compute a case insensitive hash of str */ ++static uint32_t tz_hash(const char *str) ++{ ++ const unsigned char *p = (const unsigned char *)str; ++ uint32_t hash = 5381; ++ int c; ++ ++ while ((c = tolower(*p++)) != '\0') { ++ hash = (hash << 5) ^ hash ^ c; ++ } ++ ++ return hash % LOCINFO_HASH_SIZE; ++} ++ ++/* Parse an ISO-6709 date as used in zone.tab. Returns end of the ++ * parsed string on success, or NULL on parse error. On success, ++ * writes the parsed number to *result. */ ++static char *parse_iso6709(char *p, double *result) ++{ ++ double v, sign; ++ char *pend; ++ size_t len; ++ ++ if (*p == '+') ++ sign = 1.0; ++ else if (*p == '-') ++ sign = -1.0; ++ else ++ return NULL; ++ ++ p++; ++ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) ++ ;; ++ ++ /* Annoying encoding used by zone.tab has no decimal point, so use ++ * the length to determine the format: ++ * ++ * 4 = DDMM ++ * 5 = DDDMM ++ * 6 = DDMMSS ++ * 7 = DDDMMSS ++ */ ++ len = pend - p; ++ if (len < 4 || len > 7) { ++ return NULL; ++ } ++ ++ /* p => [D]DD */ ++ v = (p[0] - '0') * 10.0 + (p[1] - '0'); ++ p += 2; ++ if (len == 5 || len == 7) ++ v = v * 10.0 + (*p++ - '0'); ++ /* p => MM[SS] */ ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 60.0; ++ p += 2; ++ /* p => [SS] */ ++ if (len > 5) { ++ v += (10.0 * (p[0] - '0') ++ + p[1] - '0') / 3600.0; ++ p += 2; ++ } ++ ++ /* Round to five decimal place, not because it's a good idea, ++ * but, because the builtin data uses rounded data, so, match ++ * that. */ ++ *result = trunc(v * sign * 100000.0) / 100000.0; ++ ++ return p; ++} ++ ++/* This function parses the zone.tab file to build up the mapping of ++ * timezone to country code and geographic location, and returns a ++ * hash table. The hash table is indexed by the function: ++ * ++ * tz_hash(timezone-name) ++ */ ++static struct location_info **create_location_table(void) ++{ ++ struct location_info **li, *i; ++ char zone_tab[PATH_MAX]; ++ char line[512]; ++ FILE *fp; ++ ++ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); ++ ++ fp = fopen(zone_tab, "r"); ++ if (!fp) { ++ return NULL; ++ } ++ ++ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); ++ ++ while (fgets(line, sizeof line, fp)) { ++ char *p = line, *code, *name, *comment; ++ uint32_t hash; ++ double latitude, longitude; ++ ++ while (isspace(*p)) ++ p++; ++ ++ if (*p == '#' || *p == '\0' || *p == '\n') ++ continue; ++ ++ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') ++ continue; ++ ++ /* code => AA */ ++ code = p; ++ p[2] = 0; ++ p += 3; ++ ++ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ ++ p = parse_iso6709(p, &latitude); ++ if (!p) { ++ continue; ++ } ++ p = parse_iso6709(p, &longitude); ++ if (!p) { ++ continue; ++ } ++ ++ if (!p || *p != '\t') { ++ continue; ++ } ++ ++ /* name = string */ ++ name = ++p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ *p++ = '\0'; ++ ++ /* comment = string */ ++ comment = p; ++ while (*p != '\t' && *p && *p != '\n') ++ p++; ++ ++ if (*p == '\n' || *p == '\t') ++ *p = '\0'; ++ ++ hash = tz_hash(name); ++ i = malloc(sizeof *i); ++ memcpy(i->code, code, 2); ++ strncpy(i->name, name, sizeof i->name); ++ i->comment = strdup(comment); ++ i->longitude = longitude; ++ i->latitude = latitude; ++ i->next = li[hash]; ++ li[hash] = i; ++ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ ++ } ++ ++ fclose(fp); ++ ++ return li; ++} ++ ++/* Return location info from hash table, using given timezone name. ++ * Returns NULL if the name could not be found. */ ++const struct location_info *find_zone_info(struct location_info **li, ++ const char *name) ++{ ++ uint32_t hash = tz_hash(name); ++ const struct location_info *l; ++ ++ if (!li) { ++ return NULL; ++ } ++ ++ for (l = li[hash]; l; l = l->next) { ++ if (timelib_strcasecmp(l->name, name) == 0) ++ return l; ++ } ++ ++ return NULL; ++} ++ ++/* Filter out some non-tzdata files and the posix/right databases, if ++ * present. */ ++static int index_filter(const struct dirent *ent) ++{ ++ return strcmp(ent->d_name, ".") != 0 ++ && strcmp(ent->d_name, "..") != 0 ++ && strcmp(ent->d_name, "posix") != 0 ++ && strcmp(ent->d_name, "posixrules") != 0 ++ && strcmp(ent->d_name, "right") != 0 ++ && strstr(ent->d_name, ".list") == NULL ++ && strstr(ent->d_name, ".tab") == NULL; ++} ++ ++static int sysdbcmp(const void *first, const void *second) ++{ ++ const timelib_tzdb_index_entry *alpha = first, *beta = second; ++ ++ return timelib_strcasecmp(alpha->id, beta->id); ++} ++ ++ ++/* Create the zone identifier index by trawling the filesystem. */ ++static void create_zone_index(timelib_tzdb *db) ++{ ++ size_t dirstack_size, dirstack_top; ++ size_t index_size, index_next; ++ timelib_tzdb_index_entry *db_index; ++ char **dirstack; ++ ++ /* LIFO stack to hold directory entries to scan; each slot is a ++ * directory name relative to the zoneinfo prefix. */ ++ dirstack_size = 32; ++ dirstack = malloc(dirstack_size * sizeof *dirstack); ++ dirstack_top = 1; ++ dirstack[0] = strdup(""); ++ ++ /* Index array. */ ++ index_size = 64; ++ db_index = malloc(index_size * sizeof *db_index); ++ index_next = 0; ++ ++ do { ++ struct dirent **ents; ++ char name[PATH_MAX], *top; ++ int count; ++ ++ /* Pop the top stack entry, and iterate through its contents. */ ++ top = dirstack[--dirstack_top]; ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); ++ ++ count = php_scandir(name, &ents, index_filter, php_alphasort); ++ ++ while (count > 0) { ++ struct stat st; ++ const char *leaf = ents[count - 1]->d_name; ++ ++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", ++ top, leaf); ++ ++ if (strlen(name) && stat(name, &st) == 0) { ++ /* Name, relative to the zoneinfo prefix. */ ++ const char *root = top; ++ ++ if (root[0] == '/') root++; ++ ++ snprintf(name, sizeof name, "%s%s%s", root, ++ *root ? "/": "", leaf); ++ ++ if (S_ISDIR(st.st_mode)) { ++ if (dirstack_top == dirstack_size) { ++ dirstack_size *= 2; ++ dirstack = realloc(dirstack, ++ dirstack_size * sizeof *dirstack); ++ } ++ dirstack[dirstack_top++] = strdup(name); ++ } ++ else { ++ if (index_next == index_size) { ++ index_size *= 2; ++ db_index = realloc(db_index, ++ index_size * sizeof *db_index); ++ } ++ ++ db_index[index_next++].id = strdup(name); ++ } ++ } ++ ++ free(ents[--count]); ++ } ++ ++ if (count != -1) free(ents); ++ free(top); ++ } while (dirstack_top); ++ ++ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); ++ ++ db->index = db_index; ++ db->index_size = index_next; ++ ++ free(dirstack); ++} ++ ++#define FAKE_HEADER "1234\0??\1??" ++#define FAKE_UTC_POS (7 - 4) ++ ++/* Create a fake data segment for database 'sysdb'. */ ++static void fake_data_segment(timelib_tzdb *sysdb, ++ struct location_info **info) ++{ ++ size_t n; ++ char *data, *p; ++ ++ data = malloc(3 * sysdb->index_size + 7); ++ ++ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); ++ ++ for (n = 0; n < sysdb->index_size; n++) { ++ const struct location_info *li; ++ timelib_tzdb_index_entry *ent; ++ ++ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; ++ ++ /* Lookup the timezone name in the hash table. */ ++ if (strcmp(ent->id, "UTC") == 0) { ++ ent->pos = FAKE_UTC_POS; ++ continue; ++ } ++ ++ li = find_zone_info(info, ent->id); ++ if (li) { ++ /* If found, append the BC byte and the ++ * country code; set the position for this ++ * section of timezone data. */ ++ ent->pos = (p - data) - 4; ++ *p++ = '\1'; ++ *p++ = li->code[0]; ++ *p++ = li->code[1]; ++ } ++ else { ++ /* If not found, the timezone data can ++ * point at the header. */ ++ ent->pos = 0; ++ } ++ } ++ ++ sysdb->data = (unsigned char *)data; ++} ++ ++/* Returns true if the passed-in stat structure describes a ++ * probably-valid timezone file. */ ++static int is_valid_tzfile(const struct stat *st, int fd) ++{ ++ if (fd) { ++ char buf[20]; ++ if (read(fd, buf, 20)!=20) { ++ return 0; ++ } ++ lseek(fd, SEEK_SET, 0); ++ if (memcmp(buf, "TZif", 4)) { ++ return 0; ++ } ++ } ++ return S_ISREG(st->st_mode) && st->st_size > 20; ++} ++ ++/* To allow timezone names to be used case-insensitively, find the ++ * canonical name for this timezone, if possible. */ ++static const char *canonical_tzname(const char *timezone) ++{ ++ if (timezonedb_system) { ++ timelib_tzdb_index_entry *ent, lookup; ++ ++ lookup.id = (char *)timezone; ++ ++ ent = bsearch(&lookup, timezonedb_system->index, ++ timezonedb_system->index_size, sizeof lookup, ++ sysdbcmp); ++ if (ent) { ++ return ent->id; ++ } ++ } ++ ++ return timezone; ++} ++ ++/* Return the mmap()ed tzfile if found, else NULL. On success, the ++ * length of the mapped data is placed in *length. */ ++static char *map_tzfile(const char *timezone, size_t *length) ++{ ++ char fname[PATH_MAX]; ++ struct stat st; ++ char *p; ++ int fd; ++ ++ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { ++ return NULL; ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); ++ ++ fd = open(fname, O_RDONLY); ++ if (fd == -1) { ++ return NULL; ++ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) { ++ close(fd); ++ return NULL; ++ } ++ ++ *length = st.st_size; ++ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); ++ close(fd); ++ ++ return p != MAP_FAILED ? p : NULL; ++} ++ ++#endif ++ ++static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) + { + int left = 0, right = tzdb->index_size - 1; + +@@ -400,9 +840,48 @@ static int seek_to_tz_position(const uns + return 0; + } + ++static int seek_to_tz_position(const unsigned char **tzf, char *timezone, ++ char **map, size_t *maplen, ++ const timelib_tzdb *tzdb) ++{ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char *orig; ++ ++ orig = map_tzfile(timezone, maplen); ++ if (orig == NULL) { ++ return 0; ++ } ++ ++ (*tzf) = (unsigned char *)orig; ++ *map = orig; ++ return 1; ++ } ++ else ++#endif ++ { ++ return inmem_seek_to_tz_position(tzf, timezone, tzdb); ++ } ++} ++ + const timelib_tzdb *timelib_builtin_db(void) + { ++#ifdef HAVE_SYSTEM_TZDATA ++ if (timezonedb_system == NULL) { ++ timelib_tzdb *tmp = malloc(sizeof *tmp); ++ ++ tmp->version = "0.system"; ++ tmp->data = NULL; ++ create_zone_index(tmp); ++ system_location_table = create_location_table(); ++ fake_data_segment(tmp, system_location_table); ++ timezonedb_system = tmp; ++ } ++ ++ return timezonedb_system; ++#else + return &timezonedb_builtin; ++#endif + } + + const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) +@@ -414,7 +893,30 @@ const timelib_tzdb_index_entry *timelib_ + int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) + { + const unsigned char *tzf; +- return (seek_to_tz_position(&tzf, timezone, tzdb)); ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (tzdb == timezonedb_system) { ++ char fname[PATH_MAX]; ++ struct stat st; ++ ++ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { ++ return 0; ++ } ++ ++ if (system_location_table) { ++ if (find_zone_info(system_location_table, timezone) != NULL) { ++ /* found in cache */ ++ return 1; ++ } ++ } ++ ++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); ++ ++ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0); ++ } ++#endif ++ ++ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); + } + + static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) +@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ct + timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) + { + const unsigned char *tzf; ++ char *memmap = NULL; ++ size_t maplen; + timelib_tzinfo *tmp; + int version; + int transitions_result, types_result; + unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */ + +- if (seek_to_tz_position(&tzf, timezone, tzdb)) { ++ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { + tmp = timelib_tzinfo_ctor(timezone); + + version = read_preamble(&tzf, tmp, &type); +@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha + timelib_tzinfo_dtor(tmp); + return NULL; + } ++ ++#ifdef HAVE_SYSTEM_TZDATA ++ if (memmap) { ++ const struct location_info *li; ++ ++ /* TZif-style - grok the location info from the system database, ++ * if possible. */ ++ ++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { ++ tmp->location.comments = timelib_strdup(li->comment); ++ strncpy(tmp->location.country_code, li->code, 2); ++ tmp->location.longitude = li->longitude; ++ tmp->location.latitude = li->latitude; ++ tmp->bc = 1; ++ } ++ else { ++ set_default_location_and_comments(&tzf, tmp); ++ } ++ ++ /* Now done with the mmap segment - discard it. */ ++ munmap(memmap, maplen); ++ } else { ++#endif + if (version == 2 || version == 3) { + if (!skip_64bit_preamble(&tzf, tmp)) { + /* 64 bit preamble is not in place */ +@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha + } else { + set_default_location_and_comments(&tzf, tmp); + } ++#ifdef HAVE_SYSTEM_TZDATA ++ } ++#endif + } else { + *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; + tmp = NULL; +diff -up php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata php-7.2.3RC1/ext/date/lib/timelib.m4 +--- php-7.2.3RC1/ext/date/lib/timelib.m4.systzdata 2018-02-13 20:18:34.000000000 +0100 ++++ php-7.2.3RC1/ext/date/lib/timelib.m4 2018-02-14 06:11:54.273089963 +0100 +@@ -81,3 +81,16 @@ io.h + + dnl Check for strtoll, atoll + AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday) ++ ++PHP_ARG_WITH(system-tzdata, for use of system timezone data, ++[ --with-system-tzdata[=DIR] to specify use of system timezone data], ++no, no) ++ ++if test "$PHP_SYSTEM_TZDATA" != "no"; then ++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) ++ ++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then ++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", ++ [Define for location of system timezone data]) ++ fi ++fi diff --git a/SOURCES/php-7.2.4-dlopen.patch b/SOURCES/php-7.2.4-dlopen.patch new file mode 100644 index 0000000..3c76474 --- /dev/null +++ b/SOURCES/php-7.2.4-dlopen.patch @@ -0,0 +1,30 @@ +diff -up php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen php-7.2.4RC1/sapi/litespeed/lsapilib.c +--- php-7.2.4RC1/sapi/litespeed/lsapilib.c.dlopen 2018-03-13 12:40:25.330885880 +0100 ++++ php-7.2.4RC1/sapi/litespeed/lsapilib.c 2018-03-13 12:41:35.797251042 +0100 +@@ -755,7 +755,7 @@ static int (*fp_lve_leave)(struct liblve + static int (*fp_lve_jail)( struct passwd *, char *) = NULL; + static int lsapi_load_lve_lib(void) + { +- s_liblve = dlopen("liblve.so.0", RTLD_LAZY); ++ s_liblve = dlopen("liblve.so.0", RTLD_NOW); + if (s_liblve) + { + fp_lve_is_available = dlsym(s_liblve, "lve_is_available"); +diff -up php-7.2.4RC1/Zend/zend_portability.h.dlopen php-7.2.4RC1/Zend/zend_portability.h +--- php-7.2.4RC1/Zend/zend_portability.h.dlopen 2018-03-13 12:33:38.000000000 +0100 ++++ php-7.2.4RC1/Zend/zend_portability.h 2018-03-13 12:40:25.330885880 +0100 +@@ -144,11 +144,11 @@ + # endif + + # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT) +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT) + # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND) + # else +-# define DL_LOAD(libname) dlopen(libname, RTLD_LAZY | RTLD_GLOBAL) ++# define DL_LOAD(libname) dlopen(libname, RTLD_NOW | RTLD_GLOBAL) + # endif + # define DL_UNLOAD dlclose + # if defined(DLSYM_NEEDS_UNDERSCORE) diff --git a/SOURCES/php-7.2.4-fixheader.patch b/SOURCES/php-7.2.4-fixheader.patch new file mode 100644 index 0000000..52a4121 --- /dev/null +++ b/SOURCES/php-7.2.4-fixheader.patch @@ -0,0 +1,12 @@ +diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac +--- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100 ++++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100 +@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` + fi + AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) + +-PHP_UNAME=`uname -a | xargs` ++PHP_UNAME=`uname | xargs` + AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) + PHP_OS=`uname | xargs` + AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) diff --git a/SOURCES/php-7.2.8-getallheaders.patch b/SOURCES/php-7.2.8-getallheaders.patch new file mode 100644 index 0000000..22a2dcb --- /dev/null +++ b/SOURCES/php-7.2.8-getallheaders.patch @@ -0,0 +1,280 @@ +Adapted for 7.2 from 7.3 by remi + + +From 0ea4013f101d64fbeb9221260b36e98f10ed1ddd Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 4 Jul 2018 08:48:38 +0200 +Subject: [PATCH] Fixed bug #62596 add getallheaders (apache_request_headers) + missing function in FPM add sapi_add_request_header in public API (was + add_request_header) fix arginfo for fastcgi_finish_request fucntion + +--- + main/SAPI.c | 50 +++++++++++++++++++++++++++++ + main/SAPI.h | 1 + + sapi/cgi/cgi_main.c | 51 +---------------------------- + sapi/fpm/fpm/fpm_main.c | 25 ++++++++++++++- + sapi/fpm/tests/getallheaders.phpt | 67 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 143 insertions(+), 51 deletions(-) + create mode 100644 sapi/fpm/tests/getallheaders.phpt + +diff --git a/main/SAPI.c b/main/SAPI.c +index b6c3329..7e0c7c8 100644 +--- a/main/SAPI.c ++++ b/main/SAPI.c +@@ -1109,6 +1109,56 @@ SAPI_API void sapi_terminate_process(void) { + } + } + ++SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */ ++{ ++ zval *return_value = (zval*)arg; ++ char *str = NULL; ++ ++ ALLOCA_FLAG(use_heap) ++ ++ if (var_len > 5 && ++ var[0] == 'H' && ++ var[1] == 'T' && ++ var[2] == 'T' && ++ var[3] == 'P' && ++ var[4] == '_') { ++ ++ char *p; ++ ++ var_len -= 5; ++ p = var + 5; ++ var = str = do_alloca(var_len + 1, use_heap); ++ *str++ = *p++; ++ while (*p) { ++ if (*p == '_') { ++ *str++ = '-'; ++ p++; ++ if (*p) { ++ *str++ = *p++; ++ } ++ } else if (*p >= 'A' && *p <= 'Z') { ++ *str++ = (*p++ - 'A' + 'a'); ++ } else { ++ *str++ = *p++; ++ } ++ } ++ *str = 0; ++ } else if (var_len == sizeof("CONTENT_TYPE")-1 && ++ memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) { ++ var = "Content-Type"; ++ } else if (var_len == sizeof("CONTENT_LENGTH")-1 && ++ memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) { ++ var = "Content-Length"; ++ } else { ++ return; ++ } ++ add_assoc_stringl_ex(return_value, var, var_len, val, val_len); ++ if (str) { ++ free_alloca(var, use_heap); ++ } ++} ++/* }}} */ ++ + /* + * Local variables: + * tab-width: 4 +diff --git a/main/SAPI.h b/main/SAPI.h +index f829fd7..4b8e223 100644 +--- a/main/SAPI.h ++++ b/main/SAPI.h +@@ -151,6 +151,7 @@ SAPI_API void sapi_shutdown(void); + SAPI_API void sapi_activate(void); + SAPI_API void sapi_deactivate(void); + SAPI_API void sapi_initialize_empty_request(void); ++SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg); + END_EXTERN_C() + + /* +diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c +index 2e9cefe..350846d 100644 +--- a/sapi/cgi/cgi_main.c ++++ b/sapi/cgi/cgi_main.c +@@ -1591,54 +1591,6 @@ PHP_FUNCTION(apache_child_terminate) /* + } + /* }}} */ + +-static void add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */ +-{ +- zval *return_value = (zval*)arg; +- char *str = NULL; +- char *p; +- ALLOCA_FLAG(use_heap) +- +- if (var_len > 5 && +- var[0] == 'H' && +- var[1] == 'T' && +- var[2] == 'T' && +- var[3] == 'P' && +- var[4] == '_') { +- +- var_len -= 5; +- p = var + 5; +- var = str = do_alloca(var_len + 1, use_heap); +- *str++ = *p++; +- while (*p) { +- if (*p == '_') { +- *str++ = '-'; +- p++; +- if (*p) { +- *str++ = *p++; +- } +- } else if (*p >= 'A' && *p <= 'Z') { +- *str++ = (*p++ - 'A' + 'a'); +- } else { +- *str++ = *p++; +- } +- } +- *str = 0; +- } else if (var_len == sizeof("CONTENT_TYPE")-1 && +- memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) { +- var = "Content-Type"; +- } else if (var_len == sizeof("CONTENT_LENGTH")-1 && +- memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) { +- var = "Content-Length"; +- } else { +- return; +- } +- add_assoc_stringl_ex(return_value, var, var_len, val, val_len); +- if (str) { +- free_alloca(var, use_heap); +- } +-} +-/* }}} */ +- + PHP_FUNCTION(apache_request_headers) /* {{{ */ + { + if (zend_parse_parameters_none()) { +@@ -1648,7 +1600,7 @@ PHP_FUNCTION(apache_request_headers) /* + if (fcgi_is_fastcgi()) { + fcgi_request *request = (fcgi_request*) SG(server_context); + +- fcgi_loadenv(request, add_request_header, return_value); ++ fcgi_loadenv(request, sapi_add_request_header, return_value); + } else { + char buf[128]; + char **env, *p, *q, *var, *val, *t = buf; +diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c +index 3256660..e815be4 100644 +--- a/sapi/fpm/fpm/fpm_main.c ++++ b/sapi/fpm/fpm/fpm_main.c +@@ -1531,6 +1531,10 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ + { + fcgi_request *request = (fcgi_request*) SG(server_context); + ++ if (zend_parse_parameters_none() == FAILURE) { ++ return; ++ } ++ + if (!fcgi_is_closed(request)) { + php_output_end_all(); + php_header(); +@@ -1545,8 +1549,27 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */ + } + /* }}} */ + ++ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0) ++ZEND_END_ARG_INFO() ++ ++PHP_FUNCTION(apache_request_headers) /* {{{ */ ++{ ++ fcgi_request *request; ++ ++ if (zend_parse_parameters_none() == FAILURE) { ++ return; ++ } ++ ++ array_init(return_value); ++ if ((request = (fcgi_request*) SG(server_context))) { ++ fcgi_loadenv(request, sapi_add_request_header, return_value); ++ } ++} /* }}} */ ++ + static const zend_function_entry cgi_fcgi_sapi_functions[] = { +- PHP_FE(fastcgi_finish_request, NULL) ++ PHP_FE(fastcgi_finish_request, cgi_fcgi_sapi_no_arginfo) ++ PHP_FE(apache_request_headers, cgi_fcgi_sapi_no_arginfo) ++ PHP_FALIAS(getallheaders, apache_request_headers, cgi_fcgi_sapi_no_arginfo) + PHP_FE_END + }; + +diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt +new file mode 100644 +index 0000000..b41f1c6 +--- /dev/null ++++ b/sapi/fpm/tests/getallheaders.phpt +@@ -0,0 +1,67 @@ ++--TEST-- ++FPM: Function getallheaders basic test ++--SKIPIF-- ++ ++--FILE-- ++start(); ++$tester->expectLogStartNotices(); ++$tester->request( ++ '', ++ [ ++ 'HTTP_X_FOO' => 'BAR', ++ 'HTTP_FOO' => 'foo' ++ ] ++ )->expectBody( ++ [ ++ 'Test Start', ++ 'array(4) {', ++ ' ["Foo"]=>', ++ ' string(3) "foo"', ++ ' ["X-Foo"]=>', ++ ' string(3) "BAR"', ++ ' ["Content-Length"]=>', ++ ' string(1) "0"', ++ ' ["Content-Type"]=>', ++ ' string(0) ""', ++ '}', ++ 'Test End', ++ ] ++ ); ++$tester->terminate(); ++$tester->expectLogTerminatingNotices(); ++$tester->close(); ++ ++?> ++Done ++--EXPECT-- ++Done ++--CLEAN-- ++ +-- +2.1.4 + diff --git a/SOURCES/php-fpm-www.conf b/SOURCES/php-fpm-www.conf new file mode 100644 index 0000000..6108783 --- /dev/null +++ b/SOURCES/php-fpm-www.conf @@ -0,0 +1,434 @@ +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or @php_fpm_prefix@) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; 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 user chosen to provide access to the same directories as httpd +user = apache +; RPM: Keep a group allowed to write in log dir. +group = apache + +; 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 IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) 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. +; Default Value: 511 +;listen.backlog = 511 + +; 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. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0660 + +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = apache +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) 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 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes + +; 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. With this process management, there will be +; always at least 1 children. +; 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. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process 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 when pm is set to 'dynamic' or 'ondemand'. +; 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. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; 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 seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; 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. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the 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 +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: @EXPANDED_DATADIR@/fpm/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 access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; 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 + +; 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 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 + +; 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: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; 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. +; Note: relative path can be used. +; 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. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; 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 .php7 + +; 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. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or @prefix@) + +; 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 the following data paths to directories owned by the FPM process user. +; +; Do not change the ownership of existing system directories, if the process +; user does not have write permission, create dedicated directories for this +; purpose. +; +; See warning about choosing the location of these directories on your system +; at http://php.net/session.save-path +php_value[session.save_handler] = files +php_value[session.save_path] = /var/lib/php/session +php_value[soap.wsdl_cache_dir] = /var/lib/php/wsdlcache +;php_value[opcache.file_cache] = /var/lib/php/opcache diff --git a/SOURCES/php-fpm.conf b/SOURCES/php-fpm.conf new file mode 100644 index 0000000..29ec0d9 --- /dev/null +++ b/SOURCES/php-fpm.conf @@ -0,0 +1,119 @@ +;;;;;;;;;;;;;;;;;;;;; +; 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 +; If it's set to "syslog", log is sent to syslogd instead of being written +; in a local file. +; Default Value: /var/log/php-fpm.log +error_log = /var/log/php-fpm/error.log + +; syslog_facility is used to specify what type of program is logging the +; message. This lets syslogd specify that messages from different facilities +; will be handled differently. +; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) +; Default Value: daemon +;syslog.facility = daemon + +; syslog_ident is prepended to every message. If you have multiple FPM +; instances running on the same server, you can change the default value +; which must suit common needs. +; Default Value: php-fpm +;syslog.ident = php-fpm + +; 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 + +; The maximum number of processes FPM will fork. This has been designed to control +; the global number of processes when using dynamic PM within a lot of pools. +; Use it with caution. +; Note: A value of 0 indicates no limit +; Default Value: 0 +;process.max = 128 + +; Specify the nice(2) priority to apply to the master process (only if set) +; The value can vary from -19 (highest priority) to 20 (lowest priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool process will inherit the master process priority +; unless specified otherwise +; Default Value: no set +;process.priority = -19 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +daemonize = yes + +; Set open file descriptor rlimit for the master process. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit for the master process. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Specify the event mechanism FPM will use. The following is available: +; - select (any POSIX os) +; - poll (any POSIX os) +; - epoll (linux >= 2.5.44) +; Default Value: not set (auto detection) +;events.mechanism = epoll + +; When FPM is built with systemd integration, specify the interval, +; in seconds, between health report notification to systemd. +; Set to 0 to disable. +; Available Units: s(econds), m(inutes), h(ours) +; Default Unit: seconds +; Default value: 10 +;systemd_interval = 10 + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; Multiple pools of child processes may be started with different listening +; ports and different management options. The name of the pool will be +; used in logs and stats. There is no limitation on the number of pools which +; FPM can handle. Your system will tell you anyway :) + +; See /etc/php-fpm.d/*.conf + diff --git a/SOURCES/php-fpm.init b/SOURCES/php-fpm.init new file mode 100644 index 0000000..63aac66 --- /dev/null +++ b/SOURCES/php-fpm.init @@ -0,0 +1,111 @@ +#! /bin/sh +# +# chkconfig: - 84 16 +# description: PHP FastCGI Process Manager +# processname: php-fpm +# config: /etc/php-fpm.conf +# config: /etc/sysconfig/php-fpm +# pidfile: /var/run/php-fpm/php-fpm.pid +# +### BEGIN INIT INFO +# Provides: php-fpm +# Required-Start: $local_fs $remote_fs $network $named +# Required-Stop: $local_fs $remote_fs $network +# Short-Description: start and stop PHP FPM +# Description: PHP FastCGI Process Manager +### END INIT INFO + +# Standard LSB functions +#. /lib/lsb/init-functions + +# Source function library. +. /etc/init.d/functions + +# Check that networking is up. +. /etc/sysconfig/network + +# Additional environment file +if [ -f /etc/sysconfig/php-fpm ]; then + . /etc/sysconfig/php-fpm +fi + +if [ "$NETWORKING" = "no" ] +then + exit 0 +fi + +RETVAL=0 +prog="php-fpm" +pidfile=${PIDFILE-/var/run/php-fpm/php-fpm.pid} +lockfile=${LOCKFILE-/var/lock/subsys/php-fpm} + +start () { + echo -n $"Starting $prog: " + dir=$(dirname ${pidfile}) + [ -d $dir ] || mkdir $dir + daemon --pidfile ${pidfile} /usr/sbin/php-fpm --daemonize + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch ${lockfile} +} +stop () { + echo -n $"Stopping $prog: " + killproc -p ${pidfile} php-fpm + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] ; then + rm -f ${lockfile} ${pidfile} + fi +} + +restart () { + stop + start +} + +reload () { + echo -n $"Reloading $prog: " + if ! /usr/sbin/php-fpm --test ; then + RETVAL=6 + echo $"not reloading due to configuration syntax error" + failure $"not reloading $prog due to configuration syntax error" + else + killproc -p ${pidfile} php-fpm -USR2 + RETVAL=$? + fi + echo +} + + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p ${pidfile} php-fpm + RETVAL=$? + ;; + restart) + restart + ;; + reload|force-reload) + reload + ;; + configtest) + /usr/sbin/php-fpm --test + RETVAL=$? + ;; + condrestart|try-restart) + [ -f ${lockfile} ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-restart|configtest}" + RETVAL=2 + ;; +esac + +exit $RETVAL 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..687dfc0 --- /dev/null +++ b/SOURCES/php-fpm.service @@ -0,0 +1,18 @@ +# It's not recommended to modify this file in-place, because it +# will be overwritten during upgrades. If you want to customize, +# the best way is to use the "systemctl edit" command. + +[Unit] +Description=The PHP FastCGI Process Manager +After=syslog.target network.target + +[Service] +Type=notify +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..4099ed6 --- /dev/null +++ b/SOURCES/php-fpm.sysconfig @@ -0,0 +1,14 @@ +# Additional environment file for php-fpm + +# This file is deprecated when systemd is used and +# will be removed in the future + +# With systemd >= 204 you can simply drop a file with the +# suffix .conf in /etc/systemd/system/php-fpm.service.d, with +# [Service] +# Environment=FOO=bar + +# See systemd documentation. +# man systemd.unit +# man systemd.exec + diff --git a/SOURCES/php.conf b/SOURCES/php.conf new file mode 100644 index 0000000..38f54ae --- /dev/null +++ b/SOURCES/php.conf @@ -0,0 +1,52 @@ +# +# The following lines prevent .user.ini files from being viewed by Web clients. +# + + + Require all denied + + + Order allow,deny + Deny from all + Satisfy All + + + +# +# 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 + +# mod_php options + + # + # Cause the PHP interpreter to handle files with a .php extension. + # + + SetHandler application/x-httpd-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" + php_value soap.wsdl_cache_dir "/var/lib/php/wsdlcache" + + #php_value opcache.file_cache "/var/lib/php/opcache" + diff --git a/SOURCES/php.ini b/SOURCES/php.ini new file mode 100644 index 0000000..ecc660c --- /dev/null +++ b/SOURCES/php.ini @@ -0,0 +1,1673 @@ +[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 is +; much more verbose when it comes to errors. We recommend using the +; development version only in development environments, as errors shown to +; application users can inadvertently leak otherwise secure information. + +; This is php.ini-production INI file. + +;;;;;;;;;;;;;;;;;;; +; 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.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.sid_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 + +; 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 is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the 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 = 4096k + +; 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 is 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. +; For production environments, we recommend logging errors rather than +; sending them 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. We strongly recommend you +; set this to 'off' for 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. +; This directive is DEPRECATED. +; Default Value: Off +; Development Value: Off +; 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. +;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) 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 media type using the Content-Type header. To +; disable this, simply set it to be empty. +; +; PHP's built-in default media type is set to text/html. +; http://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to UTF-8. +; http://php.net/default-charset +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; See also output_buffer. +; http://php.net/output-encoding +;output_encoding = + +;;;;;;;;;;;;;;;;;;;;;;;;; +; 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" + +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +; sys_temp_dir = "/tmp" + +; 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 + +; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside +; of the web tree and people will not be able to circumvent .htaccess security. +; http://php.net/cgi.dicard-path +;cgi.discard_path=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 set to 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 + +; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! +; (shebang) at the top of the running script. This line might be needed if the +; script support running both as stand-alone script and via PHP CGI<. PHP in CGI +; mode skips this line and ignores its content if this directive is turned on. +; http://php.net/cgi.check-shebang-line +;cgi.check_shebang_line=1 + +;;;;;;;;;;;;;;;; +; 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 +; +; For example: +; +; extension=mysqli +; +; When the extension library to load is not located in the default extension +; directory, You may specify an absolute path to the library file: +; +; extension=/path/to/extension/mysqli.so +; +; Note : The syntax used in previous PHP versions ('extension=.so' and +; 'extension='php_.dll') is supported for legacy reasons and may be +; deprecated in a future PHP major version. So, when it is possible, please +; move to the new ('extension=) syntax. + +;;;; +; 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] +; Use of this INI entry is deprecated, use global input_encoding instead. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < intput_encoding < iconv.input_encoding +;iconv.input_encoding = + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;iconv.internal_encoding = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. +;iconv.output_encoding = + +[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 +;intl.use_exceptions = 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 + +;Enables or disables JIT compilation of patterns. This requires the PCRE +;library to be compiled with JIT support. +pcre.jit=0 + +[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 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(). +;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 = +; Log mail to syslog; +;mail.log = syslog + +[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" + +[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 + +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +; http://php.net/mysqlnd.log_mask +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +; http://php.net/mysqlnd.mempool_default_size +;mysqlnd.mempool_default_size = 16000 + +; 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 + +; Timeout for network requests in seconds. +; http://php.net/mysqlnd.net_read_timeout +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +; http://php.net/mysqlnd.sha256_server_public_key +;mysqlnd.sha256_server_public_key = + +[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 + +[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 +; your OS has problems with many files in one directory, and is +; a more efficient layout for servers that handle many 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 strict session mode. +; Strict session mode does not accept uninitialized session ID and regenerate +; session ID if browser sends uninitialized session ID. Strict mode protects +; applications from session fixation via session adoption vulnerability. It is +; disabled by default for maximum compatibility, but enabling it is encouraged. +; https://wiki.php.net/rfc/strict_sessions +session.use_strict_mode = 0 + +; 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 be-all and end-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 -type f | xargs rm + +; 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 = + +; 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 + +; Set session ID character length. This value could be between 22 to 256. +; Shorter length than default is supported only for compatibility reason. +; Users should use 32 or more chars. +; http://php.net/session.sid_length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 +session.sid_length = 26 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +;
is special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. tag's action attribute URL will not be modified +; unless it is specified. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=" +; Development Value: "a=href,area=href,frame=src,form=" +; Production Value: "a=href,area=href,frame=src,form=" +; http://php.net/url-rewriter.tags +session.trans_sid_tags = "a=href,area=href,frame=src,form=" + +; URL rewriter does not rewrite absolute URLs by default. +; To enable rewrites for absolute pathes, target hosts must be specified +; at RUNTIME. i.e. use ini_set() +; tags is special. PHP will check action attribute's URL regardless +; of session.trans_sid_tags setting. +; If no host is defined, HTTP_HOST will be used for allowed host. +; Example value: php.net,www.php.net,wiki.php.net +; Use "," for multiple hosts. No spaces are allowed. +; Default Value: "" +; Development Value: "" +; Production Value: "" +;session.trans_sid_hosts="" + +; 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.sid_bits_per_character = 5 + +; 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" + +; Only write session data when session data is changed. Enabled by default. +; http://php.net/session.lazy-write +;session.lazy_write = On + +[Assertion] +; Switch whether to compile assertions at all (to have no overhead at run-time) +; -1: Do not compile at all +; 0: Jump over assertion at run-time +; 1: Execute assertions +; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 +; http://php.net/zend.assertions +zend.assertions = -1 + +; Assert(expr); active by default. +; http://php.net/assert.active +;assert.active = On + +; Throw an AssertationException on failed assertions +; http://php.net/assert.exception +;assert.exception = On + +; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) +; 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. +; This affects mb_send_mail() and mbstring.detect_order. +; http://php.net/mbstring.language +;mbstring.language = Japanese + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; internal/script encoding. +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;mbstring.internal_encoding = + +; Use of this INI entry is deprecated, use global input_encoding instead. +; http input encoding. +; mbstring.encoding_traslation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < intput_encoding < mbsting.http_input +; http://php.net/mbstring.http-input +;mbstring.http_input = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. +; http://php.net/mbstring.http-output +;mbstring.http_output = + +; 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" detect order is changed according to mbstring.language +; 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. +; Default: Off +;mbstring.strict_detection = On + +; 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 = 1 + +[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 + +; RPM note : cache 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 +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 + +[dba] +;dba.default_handler= + +[curl] +; A default value for the CURLOPT_CAINFO option. This is required to be an +; absolute path. +;curl.cainfo = + +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + +; Local Variables: +; tab-width: 4 +; End: diff --git a/SOURCES/php.modconf b/SOURCES/php.modconf new file mode 100644 index 0000000..3377f72 --- /dev/null +++ b/SOURCES/php.modconf @@ -0,0 +1,12 @@ +# +# PHP is an HTML-embedded scripting language which attempts to make it +# easy for developers to write dynamically generated webpages. +# + +# Cannot load both php5 and php7 modules + + + LoadModule php7_module modules/libphp7.so + + + diff --git a/SPECS/php.spec b/SPECS/php.spec new file mode 100644 index 0000000..53e12f6 --- /dev/null +++ b/SPECS/php.spec @@ -0,0 +1,2642 @@ +%if 0%{?scl:1} +%scl_package php +%else +# to allow non SCL test build +%global pkg_name %{name} +%global _root_sysconfdir %{_sysconfdir} +%global _root_bindir %{_bindir} +%global _root_sbindir %{_sbindir} +%global _root_includedir %{_includedir} +%global _root_libdir %{_libdir} +%global _root_prefix %{_prefix} +%global _root_initddir %{_initddir} +# to allow build on Fedora +%global _httpd24_mmn %{_httpd_mmn} +%global _httpd24_apxs %{_httpd_apxs} +%global _httpd24_moddir %{_httpd_moddir} +%global _httpd24_contentdir %{_httpd_contentdir} +%global _httpd24_modconfdir %{_httpd_modconfdir} +%global _httpd24_confdir %{_httpd_confdir} +%endif + +# API/ABI check +%global apiver 20170718 +%global zendver 20170718 +%global pdover 20170320 + +%global _performance_build 1 + +# Adds -z now to the linker flags +%global _hardened_build 1 + +# version used for php embedded library soname +%global embed_version 7.2 + +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d) + +%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: %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 %{_root_libdir}/mysql/mysql_config + +%if 0%{?rhel} < 7 +%global with_imap 1 +%global with_tidy 1 +%global with_webp 0 +%else +%global with_imap 0 +%global with_tidy 0 +%global with_webp 1 +%endif +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%global with_libpcre 1 +%else +%global with_libpcre 0 +%endif + +%if 0%{?__isa_bits:1} +%global isasuffix -%{__isa_bits} +%else +%global isasuffix %nil +%endif + +%if 0%{?fedora} < 12 && 0%{?rhel} < 6 +%global with_dtrace 0 +%else +%global with_dtrace 1 +%endif + +# systemd to manage the service, Fedora >= 15 +# systemd with notify mode, Fedora >= 16 +# systemd with additional service config +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +%if 0%{?fedora} < 18 && 0%{?rhel} < 7 +%global db_devel db4-devel +%else +%global db_devel libdb-devel +%endif + +Summary: PHP scripting language for creating dynamic web sites +Name: %{?scl_prefix}php +Version: 7.2.10 +Release: 3%{?dist} +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM is licensed under BSD +# main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0 +# ext/date/lib is MIT +# Zend/zend_sort is NCSA +License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA +Group: Development/Languages +URL: http://www.php.net/ + +Source0: http://www.php.net/distributions/php-%{version}.tar.xz +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 +Source11: php-fpm.init +# Configuration files for some extensions +Source50: 10-opcache.ini +Source51: opcache-default.blacklist + +# Build fixes +Patch5: php-7.2.0-includedir.patch +Patch6: php-5.6.3-embed.patch +Patch7: php-5.3.0-recode.patch +Patch8: php-7.2.0-libdb.patch +Patch9: php-7.0.7-curl.patch + +# Fixes for extension modules + +# Functional changes +Patch40: php-7.2.4-dlopen.patch +Patch42: php-7.2.3-systzdata-v16.patch +# See http://bugs.php.net/53436 +Patch43: php-5.4.0-phpize.patch +# Use -lldap_r for OpenLDAP +Patch45: php-7.2.3-ldap_r.patch +# Make php_config.h constant across builds +Patch46: php-7.2.4-fixheader.patch +# drop "Configure command" from phpinfo output +Patch47: php-5.6.3-phpinfo.patch +# getallheaders for FPM backported from 7.3 +Patch48: php-7.2.8-getallheaders.patch + +# Upstream fixes (100+) +Patch100: php-7.2.10-mysql8.patch +Patch101: php-7.2.10-fileinfo.patch + +# Security fixes (200+) + +# Fixes for tests (300+) +# Factory is droped from system tzdata +Patch300: php-7.0.10-datetests.patch +# Revert changes for pcre < 8.34 +Patch301: php-7.0.0-oldpcre.patch + + +BuildRequires: bzip2-devel, curl-devel >= 7.9, %{db_devel} +BuildRequires: %{?scl:httpd24-}httpd-devel >= 2.0.46-1, pam-devel +BuildRequires: libstdc++-devel, openssl-devel +# For SQLite3 extension +BuildRequires: sqlite-devel >= 3.6.0 +BuildRequires: zlib-devel, smtpdaemon, libedit-devel +%if %{with_libpcre} +BuildRequires: pcre-devel >= 8.20 +%endif +BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++ +BuildRequires: libtool-ltdl-devel +%if %{with_dtrace} +BuildRequires: systemtap-sdt-devel +%endif +Requires: %{?scl:httpd24-}httpd-mmn = %{_httpd24_mmn} +Provides: %{?scl:httpd24-}mod_php = %{version}-%{release} +Provides: %{?scl_prefix}mod_php = %{version}-%{release} +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +# For backwards-compatibility, require php-cli for the time being: +Requires: %{?scl_prefix}php-cli%{?_isa} = %{version}-%{release} +# To ensure correct /var/lib/php/session ownership: +Requires(pre): %{?scl:httpd24-}httpd + + +# Don't provides extensions, or shared libraries (embedded) +%{?filter_from_requires: %filter_from_requires /libphp7.*so/d} +%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} +%{?filter_provides_in: %filter_provides_in %{_httpd24_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. + +This package contains the module (often referred to as mod_php) +which adds support for the PHP language to Apache HTTP 2.4 Server. + + +%package cli +Group: Development/Languages +Summary: Command-line interface for PHP +# sapi/cli/ps_title.c is PostgreSQL +License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and PostgreSQL +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-cgi = %{version}-%{release}, %{?scl_prefix}php-cgi%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pcntl, %{?scl_prefix}php-pcntl%{?_isa} +Provides: %{?scl_prefix}php-readline, %{?scl_prefix}php-readline%{?_isa} + +%description cli +The %{?scl_prefix}php-cli package contains the command-line interface +executing PHP scripts, %{_bindir}/php, and the CGI interface. + + +%package dbg +Group: Development/Languages +Summary: The interactive PHP debugger +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} + +%description dbg +The %{?scl_prefix}php-dbg package contains the interactive PHP debugger. + + +%package fpm +Group: Development/Languages +Summary: PHP FastCGI Process Manager +BuildRequires: libacl-devel +Requires(pre): %{_root_sbindir}/useradd +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Requires(post): policycoreutils-python libselinux-utils +%if %{with_systemd} +BuildRequires: systemd-devel +BuildRequires: systemd-units +Requires: systemd-units +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 +%else +# This is for /sbin/service +Requires(preun): initscripts +Requires(postun): initscripts +%endif + +%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. + + +%package embedded +Summary: PHP library for embedding in applications +Group: System Environment/Libraries +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +# doing a real -devel package for just the .so symlink is a bit overkill +Provides: %{?scl_prefix}php-embedded-devel = %{version}-%{release} +Provides: %{?scl_prefix}php-embedded-devel%{?_isa} = %{version}-%{release} + +%description embedded +The %{?scl_prefix}php-embedded package contains a library which can be embedded +into applications to provide PHP scripting language support. + + +%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 +License: PHP and BSD +# ABI/API check - Arch specific +Provides: %{?scl_prefix}php(api) = %{apiver}%{isasuffix} +Provides: %{?scl_prefix}php(zend-abi) = %{zendver}%{isasuffix} +Provides: %{?scl_prefix}php(language) = %{version} +Provides: %{?scl_prefix}php(language)%{?_isa} = %{version} +# Provides for all builtin/shared modules: +Provides: %{?scl_prefix}php-bz2, %{?scl_prefix}php-bz2%{?_isa} +Provides: %{?scl_prefix}php-calendar, %{?scl_prefix}php-calendar%{?_isa} +Provides: %{?scl_prefix}php-core = %{version}, %{?scl_prefix}php-core%{?_isa} = %{version} +Provides: %{?scl_prefix}php-ctype, %{?scl_prefix}php-ctype%{?_isa} +Provides: %{?scl_prefix}php-curl, %{?scl_prefix}php-curl%{?_isa} +Provides: %{?scl_prefix}php-date, %{?scl_prefix}php-date%{?_isa} +Provides: bundled(timelib) +Provides: %{?scl_prefix}php-exif, %{?scl_prefix}php-exif%{?_isa} +Provides: %{?scl_prefix}php-fileinfo, %{?scl_prefix}php-fileinfo%{?_isa} +Provides: bundled(libmagic) = 5.29 +Provides: %{?scl_prefix}php-filter, %{?scl_prefix}php-filter%{?_isa} +Provides: %{?scl_prefix}php-ftp, %{?scl_prefix}php-ftp%{?_isa} +Provides: %{?scl_prefix}php-gettext, %{?scl_prefix}php-gettext%{?_isa} +Provides: %{?scl_prefix}php-hash, %{?scl_prefix}php-hash%{?_isa} +Provides: %{?scl_prefix}php-mhash = %{version}, %{?scl_prefix}php-mhash%{?_isa} = %{version} +Provides: %{?scl_prefix}php-iconv, %{?scl_prefix}php-iconv%{?_isa} +Provides: %{?scl_prefix}php-libxml, %{?scl_prefix}php-libxml%{?_isa} +Provides: %{?scl_prefix}php-openssl, %{?scl_prefix}php-openssl%{?_isa} +Provides: %{?scl_prefix}php-phar, %{?scl_prefix}php-phar%{?_isa} +Provides: %{?scl_prefix}php-pcre, %{?scl_prefix}php-pcre%{?_isa} +Provides: %{?scl_prefix}php-reflection, %{?scl_prefix}php-reflection%{?_isa} +Provides: %{?scl_prefix}php-session, %{?scl_prefix}php-session%{?_isa} +Provides: %{?scl_prefix}php-sockets, %{?scl_prefix}php-sockets%{?_isa} +Provides: %{?scl_prefix}php-spl, %{?scl_prefix}php-spl%{?_isa} +Provides: %{?scl_prefix}php-standard = %{version}, %{?scl_prefix}php-standard%{?_isa} = %{version} +Provides: %{?scl_prefix}php-tokenizer, %{?scl_prefix}php-tokenizer%{?_isa} +Provides: %{?scl_prefix}php-zlib, %{?scl_prefix}php-zlib%{?_isa} +%{?scl:Requires: %{scl}-runtime} +# For user experience, those extensions were part of php-common +Requires: %{?scl_prefix}php-json%{?_isa} = %{version}-%{release} +Requires: %{?scl_prefix}php-zip%{?_isa} = %{version}-%{release} + +%description common +The %{?scl_prefix}php-common package contains files used by both +the %{?scl_prefix}php package and the %{?scl_prefix}php-cli package. + +%package devel +Group: Development/Libraries +Summary: Files needed for building PHP extensions +Requires: %{?scl_prefix}php-cli%{?_isa} = %{version}-%{release}, autoconf, automake +%if %{with_libpcre} +Requires: pcre-devel%{?_isa} >= 8.20 +%endif + +%description devel +The %{?scl_prefix}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 opcache +Summary: The Zend OPcache +Group: Development/Languages +License: PHP +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-zendopcache = %{version} +Provides: %{?scl_prefix}php-pecl-zendopcache%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(opcache) = %{version} +Provides: %{?scl_prefix}php-pecl(opcache)%{?_isa} = %{version} + +%description opcache +The Zend OPcache provides faster PHP execution through opcode caching and +optimization. It improves PHP performance by storing precompiled script +bytecode in the shared memory. This eliminates the stages of reading code from +the disk and compiling it on future access. In addition, it applies a few +bytecode optimization patterns that make code execution faster. + +%if %{with_imap} +%package imap +Summary: A module for PHP applications that use IMAP +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: krb5-devel, openssl-devel, libc-client-devel + +%description imap +The %{?scl_prefix}php-imap module will add IMAP (Internet Message Access Protocol) +support to PHP. IMAP is a protocol for retrieving and uploading e-mail +messages on mail servers. PHP is an HTML-embedded scripting language. +%endif + +%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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel + +%description ldap +The %{?scl_prefix}php-ldap package 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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +# ABI/API check - Arch specific +Provides: %{?scl_prefix}php-pdo-abi = %{pdover}%{isasuffix} +Provides: %{?scl_prefix}php(pdo-abi) = %{pdover}%{isasuffix} +Provides: %{?scl_prefix}php-sqlite3, %{?scl_prefix}php-sqlite3%{?_isa} +Provides: %{?scl_prefix}php-pdo_sqlite, %{?scl_prefix}php-pdo_sqlite%{?_isa} + +%description pdo +The %{?scl_prefix}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. + +%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: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php_database +Provides: %{?scl_prefix}php-mysqli = %{version}-%{release} +Provides: %{?scl_prefix}php-mysqli%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pdo_mysql, %{?scl_prefix}php-pdo_mysql%{?_isa} + +%description mysqlnd +The %{?scl_prefix}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: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php_database +Provides: %{?scl_prefix}php-pdo_pgsql, %{?scl_prefix}php-pdo_pgsql%{?_isa} +BuildRequires: krb5-devel, openssl-devel, postgresql-devel + +%description pgsql +The %{?scl_prefix}php-pgsql package 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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-posix, %{?scl_prefix}php-posix%{?_isa} +Provides: %{?scl_prefix}php-shmop, %{?scl_prefix}php-shmop%{?_isa} +Provides: %{?scl_prefix}php-sysvsem, %{?scl_prefix}php-sysvsem%{?_isa} +Provides: %{?scl_prefix}php-sysvshm, %{?scl_prefix}php-sysvshm%{?_isa} +Provides: %{?scl_prefix}php-sysvmsg, %{?scl_prefix}php-sysvmsg%{?_isa} + +%description process +The %{?scl_prefix}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: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php_database +Provides: %{?scl_prefix}php-pdo_odbc, %{?scl_prefix}php-pdo_odbc%{?_isa} +BuildRequires: unixODBC-devel + +%description odbc +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: libxml2-devel + +%description soap +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}, net-snmp +BuildRequires: net-snmp-devel + +%description snmp +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-dom, %{?scl_prefix}php-dom%{?_isa} +Provides: %{?scl_prefix}php-domxml, %{?scl_prefix}php-domxml%{?_isa} +Provides: %{?scl_prefix}php-simplexml, %{?scl_prefix}php-simplexml%{?_isa} +Provides: %{?scl_prefix}php-wddx, %{?scl_prefix}php-wddx%{?_isa} +Provides: %{?scl_prefix}php-xmlreader, %{?scl_prefix}php-xmlreader%{?_isa} +Provides: %{?scl_prefix}php-xmlwriter, %{?scl_prefix}php-xmlwriter%{?_isa} +Provides: %{?scl_prefix}php-xsl, %{?scl_prefix}php-xsl%{?_isa} +BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1 + +%description xml +The %{?scl_prefix}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: %{?scl_prefix}php-xml%{?_isa} = %{version}-%{release} + +%description xmlrpc +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: bundled(oniguruma) = 6.3.0 +Provides: bundled(libmbfl) = 1.3.2 + +%description mbstring +The %{?scl_prefix}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 +# bundled libgd is licensed under BSD +License: PHP and BSD +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +# Required to build the bundled GD library +BuildRequires: libjpeg-devel, libpng-devel, freetype-devel +BuildRequires: libXpm-devel +%if %{with_webp} +BuildRequires: libwebp-devel +%endif +Provides: bundled(gd) = 2.0.35 + +%description gd +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +Provides: bundled(libbcmath) + +%description bcmath +The %{?scl_prefix}php-bcmath package contains a dynamic shared object that will add +support for using the bcmath library to PHP. + +%package gmp +Summary: A module for PHP applications for using the GNU MP library +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +BuildRequires: gmp-devel +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} + +%description gmp +These functions allow you to work with arbitrary-length integers +using the GNU MP library. + +%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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} + +%description dba +The %{?scl_prefix}php-dba package contains a dynamic shared object that will add +support for using the DBA database abstraction layer to PHP. + +%if %{with_tidy} +%package tidy +Summary: Standard PHP module provides tidy library support +Group: Development/Languages +# All files licensed under PHP version 3.01 +License: PHP +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: libtidy-devel + +%description tidy +The %{?scl_prefix}php-tidy package contains a dynamic shared object that will add +support for using the tidy library to PHP. +%endif + +%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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: aspell-devel >= 0.50.0 + +%description pspell +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: recode-devel + +%description recode +The %{?scl_prefix}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: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: libicu-devel >= 4.0 + +%description intl +The %{?scl_prefix}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 +# All files licensed under PHP version 3.0 +License: PHP +Group: System Environment/Libraries +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} +BuildRequires: enchant-devel >= 1.2.4 + +%description enchant +The %{?scl_prefix}php-enchant package contains a dynamic shared object that will add +support for using the enchant library to PHP. + +%package zip +Summary: ZIP archive management extension for PHP +# All files licensed under PHP version 3.0.1 +License: PHP +Group: System Environment/Libraries +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} + +%description zip +The %{?scl_prefix}php-zip package provides an extension that will add +support for ZIP archive management to PHP. + +%package json +Summary: JavaScript Object Notation extension for PHP +# All files licensed under PHP version 3.0.1 +License: PHP +Group: System Environment/Libraries +Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} + +%description json +The %{?scl_prefix}php-json package provides an extension that will add +support for JavaScript Object Notation (JSON) 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 +%patch9 -p1 -b .curltls + +%patch40 -p1 -b .dlopen +%patch42 -p1 -b .systzdata +%patch43 -p1 -b .headers +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%patch45 -p1 -b .ldap_r +%endif +%patch46 -p1 -b .fixheader +%patch47 -p1 -b .phpinfo +%patch48 -p1 -b .getallheaders + +# upstream patches +%patch100 -p1 -b .mysql8 +%patch101 -p1 -b .fileinfo + +# security patches + +# Fixes for tests +%patch300 -p1 -b .datetests +%if %{with_libpcre} +if ! pkg-config libpcre --atleast-version 8.34 ; then +# Only apply when system libpcre < 8.34 +%patch301 -p1 -b .pcre834 +fi +%endif + +# Prevent %%doc confusion over LICENSE files +cp Zend/LICENSE Zend/ZEND_LICENSE +cp TSRM/LICENSE TSRM_LICENSE +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 +cp ext/date/lib/LICENSE.rst timelib_LICENSE + +# Multiple builds for multiple SAPIs +mkdir \ + build-fpm \ + build-apache \ + build-embedded \ + build-cgi + +# ----- Manage known as failed test ------- +# affected by systzdata patch +rm ext/date/tests/timezone_location_get.phpt +rm ext/date/tests/timezone_version_get.phpt +rm ext/date/tests/timezone_version_get_basic1.phpt +# fails sometime +rm ext/sockets/tests/mcast_ipv?_recv.phpt +# cause stack exhausion +rm Zend/tests/bug54268.phpt +rm Zend/tests/bug68412.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 + +# 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.* + +# Create the macros.php files +sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ + -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \ + -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \ + -e "s/@PHP_VERSION@/%{version}/" \ + -e "s:@LIBDIR@:%{_libdir}:" \ + -e "s:@ETCDIR@:%{_sysconfdir}:" \ + -e "s:@INCDIR@:%{_includedir}:" \ + -e "s:@BINDIR@:%{_bindir}:" \ + -e "s:@SCL@:%{?scl:php72_}:" \ + %{SOURCE3} | tee macros.php + +# php-fpm configuration files for tmpfiles.d +# TODO echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles + +# Some extensions have their own configuration file +cp %{SOURCE50} 10-opcache.ini +%if 0%{?rhel} != 6 +cat << EOF >>10-opcache.ini + +; Enables or disables copying of PHP code (text segment) into HUGE PAGES. +; This should improve performance, but requires appropriate OS configuration. +;opcache.huge_code_pages=0 +EOF +%endif + +cp %{SOURCE51} . +sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \ + -i 10-opcache.ini + + +%build +# Set build date from https://reproducible-builds.org/specs/source-date-epoch/ +export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) + +# 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.ac +./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 + +# Always static: +# date, filter, libxml, reflection, spl: not supported +# hash: for PHAR_SIG_SHA256 and PHAR_SIG_SHA512 +# session: dep on hash, used by soap and wddx +# pcre: used by filter, zip +# pcntl, readline: only used by CLI sapi +# openssl: for PHAR_SIG_OPENSSL +# zlib: used by image + +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-exec-dir=%{_bindir} \ + --with-freetype-dir=%{_root_prefix} \ + --with-png-dir=%{_root_prefix} \ + --with-xpm-dir=%{_root_prefix} \ +%if %{with_webp} + --with-webp-dir=%{_root_prefix} \ +%endif + --without-gdbm \ + --without-sodium \ + --with-jpeg-dir=%{_root_prefix} \ + --with-openssl \ + --with-system-ciphers \ +%if %{with_libpcre} + --with-pcre-regex=%{_root_prefix} \ +%endif + --with-zlib \ + --with-layout=GNU \ + --with-kerberos \ + --with-libxml-dir=%{_root_prefix} \ + --with-system-tzdata \ + --with-mhash \ +%if %{with_dtrace} + --enable-dtrace \ +%endif + $* +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 most the shared extensions +pushd build-cgi + +build --libdir=%{_libdir}/php \ + --enable-pcntl \ + --enable-opcache-file \ +%if 0%{?rhel} == 6 + --disable-huge-code-pages \ +%endif + --enable-opcache \ + --enable-phpdbg \ +%if %{with_imap} + --with-imap=shared --with-imap-ssl \ +%endif + --enable-mbstring=shared \ + --enable-mbregex \ + --with-gd=shared \ + --with-gmp=shared \ + --enable-calendar=shared \ + --enable-bcmath=shared \ + --with-bz2=shared \ + --enable-ctype=shared \ + --enable-dba=shared --with-db4=%{_root_prefix} \ + --with-tcadb=%{_root_prefix} \ + --enable-exif=shared \ + --enable-ftp=shared \ + --with-gettext=shared \ + --with-iconv=shared \ + --enable-sockets=shared \ + --enable-tokenizer=shared \ + --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-simplexml=shared \ + --enable-xml=shared \ + --enable-wddx=shared \ + --with-snmp=shared,%{_root_prefix} \ + --enable-soap=shared \ + --with-xsl=shared,%{_root_prefix} \ + --enable-xmlreader=shared --enable-xmlwriter=shared \ + --with-curl=shared,%{_root_prefix} \ + --enable-pdo=shared \ + --with-pdo-odbc=shared,unixODBC,%{_root_prefix} \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-pgsql=shared,%{_root_prefix} \ + --with-pdo-sqlite=shared,%{_root_prefix} \ + --with-sqlite3=shared,%{_root_prefix} \ + --enable-json=shared \ + --enable-zip=shared \ + --without-readline \ + --with-libedit \ + --with-pspell=shared \ + --enable-phar=shared \ +%if %{with_tidy} + --with-tidy=shared,%{_root_prefix} \ +%endif + --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ + --enable-shmop=shared \ + --enable-posix=shared \ + --with-unixODBC=shared,%{_root_prefix} \ + --enable-intl=shared \ + --with-icu-dir=%{_root_prefix} \ + --with-enchant=shared,%{_root_prefix} \ + --with-recode=shared,%{_root_prefix} \ + --enable-fileinfo=shared +popd + +without_shared="--without-gd \ + --disable-dom --disable-dba --without-unixODBC \ + --disable-opcache \ + --disable-json \ + --disable-xmlreader --disable-xmlwriter \ + --without-sqlite3 --disable-phar --disable-fileinfo \ + --without-pspell --disable-wddx \ + --without-curl --disable-posix --disable-xml \ + --disable-simplexml --disable-exif --without-gettext \ + --without-iconv --disable-ftp --without-bz2 --disable-ctype \ + --disable-shmop --disable-sockets --disable-tokenizer \ + --disable-sysvmsg --disable-sysvshm --disable-sysvsem" + + +# Cannot use "scl enable" to have build function +%{?scl:. %{_scl_prefix}/httpd24/enable} + +# Build Apache module, and the CLI SAPI, /usr/bin/php +pushd build-apache +build --with-apxs2=%{_httpd24_apxs} \ + --libdir=%{_libdir}/php \ + --without-mysqli \ + --disable-pdo \ + ${without_shared} +popd + +# Build php-fpm +pushd build-fpm +build --enable-fpm \ +%if %{with_systemd} + --with-fpm-systemd \ +%endif + --with-fpm-acl \ + --libdir=%{_libdir}/php \ + --without-mysqli \ + --disable-pdo \ + ${without_shared} +popd + +# Build for inclusion as embedded script language into applications, +# /usr/lib[64]/libphp7.so +pushd build-embedded +build --enable-embed \ + --without-mysqli \ + --disable-pdo \ + ${without_shared} +popd + + +%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 +export SKIP_IO_CAPTURE_TESTS=1 +unset TZ LANG LC_ALL +if ! make test; then + set +x + for f in $(find .. -name \*.diff -type f -print); do + if ! grep -q XFAIL "${f/.diff/.phpt}" + then + echo "TEST FAILURE: $f --" + head -n 100 "$f" + echo -e "\n-- $f result ends." + fi + done + set -x + #exit 1 +fi +unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ +%endif + +%install +# 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 + +# Install the php-fpm binary +make -C build-fpm install-fpm \ + INSTALL_ROOT=$RPM_BUILD_ROOT + +# Install everything from the CGI SAPI build +make -C build-cgi install \ + INSTALL_ROOT=$RPM_BUILD_ROOT + +# 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 + +%if %{with_libpcre} +if ! pkg-config libpcre --atleast-version 8.38 ; then + sed -e 's/;pcre.jit=1/pcre.jit=0/' -i $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +fi +%endif + +# For third-party packaging: +install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php + +sed -e 's/libphp7/lib%{name}7/' %{SOURCE9} >modconf + +# install the DSO +install -D -m 755 build-apache/libs/libphp7.so $RPM_BUILD_ROOT%{_httpd24_moddir}/lib%{name}7.so + +# Apache config fragment +install -D -m 644 php.gif $RPM_BUILD_ROOT%{_httpd24_contentdir}/icons/%{name}.gif +install -D -m 644 modconf $RPM_BUILD_ROOT%{_httpd24_modconfdir}/15-%{name}.conf +install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd24_confdir}/%{name}.conf +sed -e 's:/var/lib:%{_localstatedir}/lib:' \ + -i $RPM_BUILD_ROOT%{_httpd24_confdir}/%{name}.conf + +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php +install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session +install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/wsdlcache +install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/opcache + +# PHP-FPM stuff +# Log +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/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 +sed -e 's:/run:%{_localstatedir}/run:' \ + -e 's:/var/log:%{_localstatedir}/log:' \ + -e 's:/etc:%{_sysconfdir}:' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf +sed -e 's:/var/lib:%{_localstatedir}/lib:' \ + -e 's:/var/log:%{_localstatedir}/log:' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf +mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default . +mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.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 +%if %{with_systemd} +install -m 755 -d $RPM_BUILD_ROOT%{_unitdir} +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service +sed -e 's:/run:%{_localstatedir}/run:' \ + -e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \ + -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ + -e 's:/usr/sbin:%{_sbindir}:' \ + -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service +# this folder requires systemd >= 204 +install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d +%else +# Service +install -m 755 -d $RPM_BUILD_ROOT%{_root_initddir} +install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_root_initddir}/%{?scl_prefix}php-fpm +# Needed relocation for SCL +sed -e '/php-fpm.pid/s:/var:%{_localstatedir}:' \ + -e '/subsys/s/php-fpm/%{?scl_prefix}php-fpm/' \ + -e 's:/etc/sysconfig/php-fpm:%{_sysconfdir}/sysconfig/php-fpm:' \ + -e 's:/etc/php-fpm.conf:%{_sysconfdir}/php-fpm.conf:' \ + -e 's:/usr/sbin:%{_sbindir}:' \ + -i $RPM_BUILD_ROOT%{_root_initddir}/%{?scl_prefix}php-fpm +%endif + +# LogRotate +install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm +sed -e 's:/run:%{_localstatedir}/run:' \ + -e 's:/var/log:%{_localstatedir}/log:' \ + -i $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm + +# Environment file +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm +sed -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm + +# 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 mysqli pdo_mysql \ + json \ +%if %{with_imap} + imap \ +%endif + mbstring gd dom xsl soap bcmath dba xmlreader xmlwriter \ + simplexml bz2 calendar ctype exif ftp gettext gmp iconv \ + sockets tokenizer opcache \ + pdo pdo_pgsql pdo_odbc pdo_sqlite \ + sqlite3 \ + enchant \ + phar fileinfo intl \ +%if %{with_tidy} + tidy \ +%endif + recode \ + zip \ + pspell curl wddx xml \ + posix shmop sysvshm sysvsem sysvmsg +do + # for extension load order + case $mod in + opcache) + # Zend extensions + ini=10-${mod}.ini;; + pdo_*|mysqli|wddx|xmlreader|xmlrpc) + # Extensions with dependencies on 20-* + ini=30-${mod}.ini;; + *) + # Extensions with no dependency + ini=20-${mod}.ini;; + esac + # some extensions have their own config file + if [ -f ${ini} ]; then + cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} + else + cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} < files.${mod} <> files.xml + +# mysqlnd +cat files.mysqli \ + files.pdo_mysql \ + >> 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.shmop 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 zip, curl, phar and fileinfo in -common. +cat files.curl files.phar files.fileinfo \ + files.exif files.gettext files.iconv files.calendar \ + files.ftp files.bz2 files.ctype files.sockets \ + files.tokenizer > files.common +cat files.zip >> files.common + +# The default Zend OPcache blacklist file +install -m 644 opcache-default.blacklist $RPM_BUILD_ROOT%{_sysconfdir}/php.d/opcache-default.blacklist + +# Install the macros file: +install -m 644 -D macros.php \ + $RPM_BUILD_ROOT%{macrosdir}/macros.%{name} +%{?nfsmountable:install -D -m 644 macros.php %{buildroot}%{_scl_scripts}/register.content%{macrosdir}/macros.%{name}} + +# Remove unpackaged files +rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \ + $RPM_BUILD_ROOT%{_bindir}/{phptar} \ + $RPM_BUILD_ROOT%{_datadir}/pear \ + $RPM_BUILD_ROOT%{_libdir}/libphp7.la + +# Remove irrelevant docs +rm -f README.{Zeus,QNX,CVS-RULES} + +touch files.fpm + +# For register/deregister script in SCL, when build with nfsmountable +%if 0%{?nfsmountable:1} +install -D -m 644 $RPM_BUILD_ROOT%{_sysconfdir}/php.ini \ + $RPM_BUILD_ROOT%{_scl_scripts}/register.content%{_sysconfdir}/php.ini + +install -D -m 644 $RPM_BUILD_ROOT%{_sysconfdir}/php.d/opcache-default.blacklist \ + $RPM_BUILD_ROOT%{_scl_scripts}/register.content%{_sysconfdir}/php.d/opcache-default.blacklist + +echo "%{_scl_scripts}/register.content%{_sysconfdir}/php.d/opcache-default.blacklist" >>files.opcache + +install -m 700 -d $RPM_BUILD_ROOT%{_scl_scripts}/register.content%{_localstatedir}/lib/php/session +install -m 700 -d $RPM_BUILD_ROOT%{_scl_scripts}/register.content%{_localstatedir}/lib/php/wsdlcache + +dir=%{_scl_scripts}/register.content%{_sysconfdir}/php.d +while [ "$dir" != "%{_scl_scripts}/register.content" ] +do echo "%dir $dir" >>files.common + dir=$(dirname $dir) +done + +cat >>files.common <$RPM_BUILD_ROOT%{_scl_scripts}/register.d/60-post-fpm <$RPM_BUILD_ROOT%{_scl_scripts}/deregister.d/40-preun-fpm <$RPM_BUILD_ROOT%{_scl_scripts}/deregister.d/60-postun-fpm <>files.fpm + dir=$(dirname $dir) +done + +%else +install -D -m 644 $RPM_BUILD_ROOT%{_root_initddir}/%{?scl_prefix}php-fpm \ + $RPM_BUILD_ROOT%{_scl_scripts}/register.content%{_root_initddir}/%{?scl_prefix}php-fpm + +cat >$RPM_BUILD_ROOT%{_scl_scripts}/register.d/60-post-fpm <$RPM_BUILD_ROOT%{_scl_scripts}/deregister.d/40-preun-fpm <>files.fpm + dir=$(dirname $dir) +done +%endif + +dir=%{_scl_scripts}/register.content%{macrosdir} +while [ "$dir" != "%{_scl_scripts}/register.content" ] +do echo "%dir $dir" >>files.common + dir=$(dirname $dir) +done + +dir=%{_scl_scripts}/register.content%{_localstatedir}/lib/php +while [ "$dir" != "%{_scl_scripts}/register.content" ] +do echo "%dir $dir" >>files.common + dir=$(dirname $dir) +done + +cat >>files.fpm </dev/null || \ + groupadd -g 48 -r apache +getent passwd apache >/dev/null || \ + useradd -r -u 48 -g apache -s /sbin/nologin \ + -d %{_httpd24_contentdir} -c "Apache" apache +exit 0 + +%post fpm +%if %{with_systemd} +semanage fcontext -a -e \ + %{_unitdir}/php-fpm.service \ + %{_unitdir}/%{?scl_prefix}php-fpm.service &>/dev/null || : +selinuxenabled && load_policy || : +restorecon %{_unitdir}/%{?scl_prefix}php-fpm.service &>/dev/null || : +%else +semanage fcontext -a -e \ + %{_root_initddir}/php-fpm \ + %{_root_initddir}/%{?scl_prefix}php-fpm &>/dev/null || : +selinuxenabled && load_policy || : +restorecon %{_root_initddir}/%{?scl_prefix}php-fpm &>/dev/null || : +%endif + +%if 0%{?systemd_post:1} +%systemd_post %{?scl:%{scl}-}php-fpm.service +%else +if [ $1 = 1 ]; then + # Initial installation +%if %{with_systemd} + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +%else + /sbin/chkconfig --add %{?scl_prefix}php-fpm +%endif +fi +%endif + +%preun fpm +%if 0%{?systemd_preun:1} +%systemd_preun %{?scl:%{scl}-}php-fpm.service +%else +if [ $1 = 0 ]; then + # Package removal, not upgrade +%if %{with_systemd} + /bin/systemctl --no-reload disable %{?scl_prefix}php-fpm.service >/dev/null 2>&1 || : + /bin/systemctl stop %{?scl_prefix}php-fpm.service >/dev/null 2>&1 || : +%else + /sbin/service %{?scl_prefix}php-fpm stop >/dev/null 2>&1 + /sbin/chkconfig --del %{?scl_prefix}php-fpm +%endif +fi +%endif + +%postun fpm +%if 0%{?systemd_postun_with_restart:1} +%systemd_postun_with_restart %{?scl:%{scl}-}php-fpm.service +%else +%if %{with_systemd} +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ]; then + # Package upgrade, not uninstall + /bin/systemctl try-restart %{?scl_prefix}php-fpm.service >/dev/null 2>&1 || : +fi +%else +if [ $1 -ge 1 ]; then + /sbin/service %{?scl_prefix}php-fpm condrestart >/dev/null 2>&1 || : +fi +%endif +%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 -- %{?scl_prefix}php-fpm +%if %{with_systemd} +if [ -f /etc/rc.d/init.d/%{?scl_prefix}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 %{?scl_prefix}php-fpm >/dev/null 2>&1 || : + + # Run these because the SysV package being removed won't do them + /sbin/chkconfig --del %{?scl_prefix}php-fpm >/dev/null 2>&1 || : + /bin/systemctl try-restart %{?scl_prefix}php-fpm.service >/dev/null 2>&1 || : +fi +%endif + + +%{!?_licensedir:%global license %%doc} + +%files +%{_httpd24_moddir}/lib%{name}7.so +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/opcache +%{?nfsmountable:%attr(0770,root,apache) %dir %{_scl_scripts}/register.content%{_localstatedir}/lib/php/session} +%{?nfsmountable:%attr(0770,root,apache) %dir %{_scl_scripts}/register.content/%{_localstatedir}/lib/php/wsdlcache} +%config(noreplace) %{_httpd24_confdir}/%{name}.conf +%config(noreplace) %{_httpd24_modconfdir}/15-%{name}.conf +%{_httpd24_contentdir}/icons/%{name}.gif + +%files common -f files.common +%doc CODING_STANDARDS CREDITS EXTENSIONS NEWS README* +%license LICENSE Zend/ZEND_* TSRM_LICENSE +%license libmagic_LICENSE +%license phar_LICENSE +%license timelib_LICENSE +%doc php.ini-* +%config(noreplace) %{_sysconfdir}/php.ini +%dir %{_sysconfdir}/php.d +%dir %{_libdir}/php +%dir %{_libdir}/php/modules +%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 + +%files dbg +%{_bindir}/phpdbg +%{_mandir}/man1/phpdbg.1* +%doc sapi/phpdbg/{README.md,CREDITS} + +%files fpm -f files.fpm +%doc php-fpm.conf.default www.conf.default +%license fpm_LICENSE +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache +%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/opcache +%{?nfsmountable:%attr(0770,root,apache) %dir %{_scl_scripts}/register.content%{_localstatedir}/lib/php/session} +%{?nfsmountable:%attr(0770,root,apache) %dir %{_scl_scripts}/register.content/%{_localstatedir}/lib/php/wsdlcache} +%config(noreplace) %{_sysconfdir}/php-fpm.conf +%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf +%config(noreplace) %{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm +%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm +# %%{_prefix}/lib/tmpfiles.d/php-fpm.conf +%if %{with_systemd} +%{_unitdir}/%{?scl_prefix}php-fpm.service +%dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d +%else +%{_root_initddir}/%{?scl_prefix}php-fpm +%endif +%{_sbindir}/php-fpm +%dir %{_sysconfdir}/php-fpm.d +# log owned by apache for log +%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm +%dir %{_localstatedir}/run/php-fpm +%{_mandir}/man8/php-fpm.8* +%dir %{_datadir}/fpm +%{_datadir}/fpm/status.html + +%files embedded +%{_libdir}/libphp7.so +%{_libdir}/libphp7-%{embed_version}.so + +%files devel +%{_bindir}/php-config +%{_includedir}/php +%{_libdir}/php/build +%{_mandir}/man1/php-config.1* +%{macrosdir}/macros.%{name} +%{?nfsmountable:%{_scl_scripts}/register.content%{macrosdir}/macros.%{name}} + +%files pgsql -f files.pgsql +%files odbc -f files.odbc +%if %{with_imap} +%files imap -f files.imap +%endif +%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 +%license libmbfl_LICENSE +%license oniguruma_COPYING +%license ucgendat_LICENSE +%files gd -f files.gd +%license libgd_README +%license libgd_COPYING +%files soap -f files.soap +%files bcmath -f files.bcmath +%license libbcmath_COPYING +%files gmp -f files.gmp +%files dba -f files.dba +%files pdo -f files.pdo +%if %{with_tidy} +%files tidy -f files.tidy +%endif +%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 +%files opcache -f files.opcache +%config(noreplace) %{_sysconfdir}/php.d/opcache-default.blacklist +%files zip -f files.zip +%files json -f files.json + + +%changelog +* Wed Nov 7 2018 Remi Collet - 7.2.10-3 +- add upstream patch for fileinfo performance #1644378 + +* Thu Sep 27 2018 Remi Collet - 7.2.10-2 +- revert all MySQL 8 auth related changes #1631399 + +* Thu Sep 13 2018 Remi Collet - 7.2.10-1 +- update to 7.2.10 + +* Wed Jul 18 2018 Remi Collet - 7.2.8-1 +- update to 7.2.8 + +* Tue Jul 10 2018 Remi Collet - 7.2.7-1 +- update to 7.2.7 for rh-php72 collection in RHSCL 7.2 +- FPM: add getallheaders, backported from 7.3 + +* Tue Aug 8 2017 Remi Collet - 7.1.8-1 +- rebase to 7.1.8 #1465319 +- drop upstream oniguruma patch + +* Thu Jun 8 2017 Remi Collet - 7.1.6-1 +- rebase to 7.1.6 + +* Fri Jun 2 2017 Remi Collet - 7.1.5-2 +- fix License, timelib is MIT +- add upstream security patches for oniguruma CVE-2017-9224, + CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, CVE-2017-9229 + +* Thu Jun 1 2017 Remi Collet - 7.1.5-1 +- update to 7.1.5 for rh-php71 in rhscl 3.0 + +* Wed Nov 2 2016 Remi Collet - 7.0.10-2 +- fix definition of php_* macros #1390885 + +* Tue Sep 6 2016 Remi Collet - 7.0.10-1 +- rebase to 7.0.10 #1365397 +- fix default include_path + +* Thu Jul 21 2016 Remi Collet - 7.0.9-1 +- update to 7.0.9 for RHSCL 2.3 + +* Mon Feb 15 2016 Remi Collet - 5.6.5-8 +- Phar: fix segmentation fault in Phar::convertToData on + invalid file CVE-2015-5589 +- Phar: fix buffer overflow and stack smashing error in + phar_fix_filepath CVE-2015-5590 +- Phar: fix files from archive can be extracted outside of + destination directory using phar CVE-2015-6833 +- Phar: NULL pointer dereference in phar_get_fp_offset() + CVE-2015-7803 +- Phar: uninitialized pointer in phar_make_dirstream() + CVE-2015-7804 +- Xslt: fix NULL pointer dereference in XSLTProcessor class + CVE-2015-6837 CVE-2015-6838 +- Core: fix use-after-free vulnerability in session + deserializer CVE-2015-6835 +- Core: fix multiple unserialization use-after-free issues + CVE-2015-6834 +- Spl: fix dangling pointer in the unserialization of + ArrayObject items CVE-2015-6832 +- Spl: fix Use After Free Vulnerability in unserialize() + CVE-2015-6831 +- Soap: fix type confusion in SOAP serialize_function_call() + CVE-2015-6836 + +* Wed Jun 10 2015 Remi Collet - 5.6.5-7 +- fix more functions accept paths with NUL character #1213407 + +* Tue Jun 9 2015 Remi Collet - 5.6.5-6 +- core: fix multipart/form-data request can use excessive + amount of CPU usage CVE-2015-4024 +- fix various functions accept paths with NUL character + CVE-2015-4025, CVE-2015-4026, #1213407 +- fileinfo: fix denial of service when processing a crafted + file #1213442 +- ftp: fix integer overflow leading to heap overflow when + reading FTP file listing CVE-2015-4022 +- phar: fix buffer over-read in metadata parsing CVE-2015-2783 +- phar: invalid pointer free() in phar_tar_process_metadata() + CVE-2015-3307 +- phar: fix buffer overflow in phar_set_inode() CVE-2015-3329 +- phar: fix memory corruption in phar_parse_tarfile caused by + empty entry file name CVE-2015-4021 +- pgsql: fix NULL pointer dereference CVE-2015-1352 +- soap: fix type confusion through unserialize #1222538 +- apache2handler: fix pipelined request executed in deinitialized + interpreter under httpd 2.4 CVE-2015-3330 + +* Fri Apr 17 2015 Remi Collet - 5.6.5-5 +- mod_php: filter libphp5.so out of provides #1212726 +- fpm: fix incorrect selinux contexts #1194337 + +* Wed Apr 15 2015 Remi Collet - 5.6.5-4 +- core: fix use-after-free vulnerability in the + process_nested_data function (unserialize) CVE-2015-2787 +- core: fix NUL byte injection in file name argument of + move_uploaded_file() CVE-2015-2348 +- date: fix use after free vulnerability in unserialize() + with DateTimeZone CVE-2015-0273 +- enchant: fix heap buffer overflow in + enchant_broker_request_dict() CVE-2014-9705 +- ereg: fix heap overflow in regcomp() CVE-2015-2305 +- opcache: fix use after free CVE-2015-1351 +- phar: fix use after free in phar_object.c CVE-2015-2301 +- pgsql: fix NULL pointer dereference CVE-2015-1352 +- soap: fix type confusion through unserialize #1204868 +- zip: integer overflow when processing ZIP archives CVE-2015-2331 + +* Mon Mar 16 2015 Remi Collet 5.6.5-3 +- rebuild to remove scls directory #1200056 + +* Wed Jan 28 2015 Remi Collet 5.6.5-2 +- fix unowned dir in register.content + +* Mon Jan 26 2015 Remi Collet 5.6.5-1 +- Update to 5.6.5 + http://www.php.net/releases/5_6_5.php +- FPM: enable ACL for Unix Domain Socket +- Embdded: filter requires for libphp5-5.6.so +- add register.content + +* Tue Jan 20 2015 Remi Collet 5.6.4-1 +- standard build +- fix php-fpm.service.d location + +* Wed Jan 14 2015 Remi Collet 5.6.4-0 +- initial package for rh-php56 in RHSCL-2.0 +- bootstrap build + +* Wed Dec 17 2014 Remi Collet 5.6.4-2 +- Update to 5.6.4 + http://www.php.net/releases/5_6_4.php +- add sybase_ct extension (in mssql sub-package) +- xmlrpc requires xml + +* Wed Dec 10 2014 Remi Collet 5.6.4-1 +- Update to 5.6.4 + http://www.php.net/releases/5_6_4.php + +* Thu Nov 27 2014 Remi Collet 5.6.4-0.1.RC1 +- update to 5.6.4RC1 + +* Wed Nov 26 2014 Remi Collet 5.6.3-3 +- add embedded sub package +- filter all libraries to avoid provides + +* Sun Nov 16 2014 Remi Collet 5.6.3-2 +- FPM: add upstream patch for https://bugs.php.net/68421 + access.format=R doesn't log ipv6 address +- FPM: add upstream patch for https://bugs.php.net/68420 + listen=9000 listens to ipv6 localhost instead of all addresses +- FPM: add upstream patch for https://bugs.php.net/68423 + will no longer load all pools + +* Thu Nov 13 2014 Remi Collet 5.6.3-1 +- Update to PHP 5.6.3 + http://php.net/releases/5_6_3.php + +* Sun Nov 2 2014 Remi Collet 5.6.3-0.1.RC1 +- update to 5.6.3RC1 +- new version of systzdata patch, fix case sensitivity +- ignore Factory in date tests +- disable opcache.fast_shutdown in default config +- add php56-cgi command in base system + +* Thu Oct 16 2014 Remi Collet 5.6.2-1 +- Update to PHP 5.6.2 + http://php.net/releases/5_6_2.php + +* Fri Oct 3 2014 Remi Collet 5.6.1-1 +- Update to PHP 5.6.1 + http://php.net/releases/5_6_1.php +- use default system cipher list by Fedora policy + http://fedoraproject.org/wiki/Changes/CryptoPolicy +- add system php library to default include_path + +* Fri Aug 29 2014 Remi Collet 5.6.0-1.1 +- enable libvpx on EL 6 (with libvpx 1.3.0) +- add php56-phpdbg command in base system + +* Thu Aug 28 2014 Remi Collet 5.6.0-1 +- PHP 5.6.0 is GA +- add lsphp56 command in base system + +* Sun Aug 24 2014 Remi Collet - 5.6.0-0.1.RC4 +- initial spec for PHP 5.6 as Software Collection +- adapted from php 5.6 spec file from remi repository +- adapted from php 5.5 spec file from rhscl 1.1 + +* Tue May 13 2014 Remi Collet - 5.5.6-10 +- fileinfo: fix out-of-bounds memory access CVE-2014-2270 +- fileinfo: fix extensive backtracking CVE-2013-7345 + +* Fri Mar 21 2014 Remi Collet - 5.5.6-9 +- gd: fix NULL deref in imagecrop CVE-2013-7327 +- gd: drop vpx support, fix huge memory consumption #1075201 + +* Fri Feb 21 2014 Remi Collet - 5.5.6-8 +- fix patch name +- fix memory leak introduce in patch for CVE-2014-1943 +- fix heap-based buffer over-read in DateInterval CVE-2013-6712 + +* Wed Feb 19 2014 Remi Collet - 5.5.6-7 +- fix infinite recursion in fileinfo CVE-2014-1943 + +* Fri Feb 14 2014 Remi Collet - 5.5.6-6 +- fix heap overflow vulnerability in imagecrop CVE-2013-7226 + +* Tue Feb 4 2014 Remi Collet - 5.5.6-5 +- allow multiple paths in ini_scan_dir #1058161 + +* Fri Dec 6 2013 Remi Collet - 5.5.6-4 +- add security fix for CVE-2013-6420 + +* Tue Nov 19 2013 Remi Collet 5.5.6-2 +- rebuild with test enabled +- add dependency on php-pecl-jsonc + +* Tue Nov 19 2013 Remi Collet 5.5.6-0 +- update to PHP 5.5.6 +- buildstrap build + +* Thu Oct 17 2013 Remi Collet 5.5.5-1 +- update to PHP 5.5.5 +- mod_php only for httpd24 + +* Thu Sep 19 2013 Remi Collet 5.5.4-1 +- update to PHP 5.5.4 +- improve security, use specific soap.wsdl_cache_dir + use /var/lib/php/wsdlcache for mod_php and php-fpm +- sync short_tag comments in php.ini with upstream +- relocate RPM macro + +* Wed Aug 21 2013 Remi Collet 5.5.3-1 +- update to PHP 5.5.3 +- improve system libzip patch +- fix typo and add missing entries in php.ini + +* Fri Aug 2 2013 Remi Collet 5.5.1-1 +- update to PHP 5.5.1 for php55 SCL + +* Mon Jul 29 2013 Remi Collet 5.4.16-6 +- rebuild for new httpd-mmn value + +* Mon Jul 29 2013 Remi Collet 5.4.16-5 +- remove ZTS conditional stuf for ligibility +- add mod_php for apache 2.4 (from httpd24 collection) + +* Thu Jul 18 2013 Remi Collet 5.4.16-4 +- improve mod_php, pgsql and ldap description +- add missing man pages (phar, php-cgi) +- add provides php(pdo-abi) for consistency with php(api) and php(zend-abi) +- use %%__isa_bits instead of %%__isa in ABI suffix #985350 + +* Fri Jul 12 2013 Remi Collet - 5.4.16-3 +- add security fix for CVE-2013-4113 +- add missing ASL 1.0 license + +* Fri Jun 7 2013 Remi Collet 5.4.16-2 +- run tests during build + +* Fri Jun 7 2013 Remi Collet 5.4.16-1 +- rebase to 5.4.16 +- fix hang in FindTishriMolad(), #965144 +- patch for upstream Bug #64915 error_log ignored when daemonize=0 +- patch for upstream Bug #64949 Buffer overflow in _pdo_pgsql_error, #969103 +- patch for upstream bug #64960 Segfault in gc_zval_possible_root + +* Thu May 23 2013 Remi Collet 5.4.14-3 +- remove wrappers in /usr/bin (#966407) + +* Thu Apr 25 2013 Remi Collet 5.4.14-2 +- rebuild for libjpeg (instead of libjpeg_turbo) +- fix unowned dir %%{_datadir}/fpm and %%{_libdir}/httpd (#956221) + +* Thu Apr 11 2013 Remi Collet 5.4.14-1 +- update to 5.4.14 +- clean old deprecated options + +* Wed Mar 13 2013 Remi Collet 5.4.13-1 +- update to 5.4.13 +- security fixes for CVE-2013-1635 and CVE-2013-1643 +- make php-mysql package optional (and disabled) +- make ZTS build optional (and disabled) +- always try to load mod_php (apache warning is usefull) +- Hardened build (links with -z now option) +- Remove %%config from /etc/rpm/macros.php + +* 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 +- drop "Configure Command" from phpinfo output +- prevent php_config.h changes across (otherwise identical) + rebuilds + + +* Thu Nov 22 2012 Remi Collet 5.4.9-1 +- update to 5.4.9 + +* Mon Nov 19 2012 Remi Collet 5.4.8-7 +- fix php.conf + +* Mon Nov 19 2012 Remi Collet 5.4.8-6 +- filter private shared in _httpd_modir +- improve system libzip patch to use pkg-config +- use _httpd_contentdir macro and fix php.gif path +- switch back to upstream generated scanner/parser +- use system pcre only when recent enough + +* Fri Nov 16 2012 Remi Collet 5.4.8-5 +- improves php.conf, no need to be relocated + +* Fri Nov 9 2012 Remi Collet 5.4.8-6 +- clarify Licenses +- missing provides xmlreader and xmlwriter +- change php embedded library soname version to 5.4 + +* Mon Nov 5 2012 Remi Collet 5.4.8-4 +- fix mysql_sock macro definition + +* Thu Oct 25 2012 Remi Collet 5.4.8-4 +- fix standard build (non scl) + +* 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 + +* Tue Oct 23 2012 Remi Collet 5.4.8-3 +- add missing scl_prefix in some provides/requires + +* Tue Oct 23 2012 Remi Collet 5.4.8-2.1 +- make php-enchant optionnal, not available on RHEL-5 +- make php-recode optionnal, not available on RHEL-5 +- disable t1lib on RHEL-5 + +* Tue Oct 23 2012 Remi Collet 5.4.8-2 +- enable tidy on RHEL-6 only +- re-enable unit tests + +* Tue Oct 23 2012 Remi Collet 5.4.8-1.2 +- minor macro fixes for RHEL-5 build +- update autotools workaround for RHEL-5 +- use readline when libedit not available (RHEL-5) + +* Mon Oct 22 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) +- use SKIP_ONLINE_TEST during make test +- php-devel requires pcre-devel and php-cli (instead of php) +- provides php-phar +- update systzdata patch to v10, timezone are case insensitive + +* Mon Oct 15 2012 Remi Collet 5.4.7-4 +- php-fpm: create apache user if needed +- php-cli: provides cli command in standard root (scl) + +* Fri Oct 12 2012 Remi Collet 5.4.7-3 +- add configtest option to init script +- test configuration before service reload +- fix php-fpm service relocation +- fix php-fpm config relocation +- drop embdded subpackage for scl + +* Wed Oct 3 2012 Remi Collet 5.4.7-2 +- missing requires on scl-runtime +- relocate /var/lib/session +- fix php-devel requires +- rename, but don't relocate macros.php + +* Tue Oct 2 2012 Remi Collet 5.4.7-1 +- initial spec rewrite for scl build + +* 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 + +* 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