diff options
| -rw-r--r-- | 10-opcache.ini | 3 | ||||
| -rw-r--r-- | 20-oci8.ini | 2 | ||||
| -rw-r--r-- | php-7.1.7-httpd.patch | 28 | ||||
| -rw-r--r-- | php.ini | 23 | ||||
| -rw-r--r-- | php.spec | 14 |
5 files changed, 51 insertions, 19 deletions
diff --git a/10-opcache.ini b/10-opcache.ini index 39c6b6f..1bf3d2a 100644 --- a/10-opcache.ini +++ b/10-opcache.ini @@ -1,5 +1,5 @@ ; Enable Zend OPcache extension module -zend_extension=opcache.so +zend_extension=opcache ; Determines if Zend OPCache is enabled opcache.enable=1 @@ -43,6 +43,7 @@ opcache.max_accelerated_files=4000 ;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. diff --git a/20-oci8.ini b/20-oci8.ini index f1fe49a..46e0668 100644 --- a/20-oci8.ini +++ b/20-oci8.ini @@ -1,5 +1,5 @@ ; Enable oci8 extension module -extension=oci8.so +extension=oci8 ; Connection: Enables privileged connections using external ; credentials (OCI_SYSOPER, OCI_SYSDBA) diff --git a/php-7.1.7-httpd.patch b/php-7.1.7-httpd.patch new file mode 100644 index 0000000..acb3d2c --- /dev/null +++ b/php-7.1.7-httpd.patch @@ -0,0 +1,28 @@ +Disable MPM detection + +mod_php is build twice +- as NTS without option +- as ZTS using --enable-maintainer-zts + +diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +index 2e64b21..ec4799f 100644 +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then + ;; + esac + +- if test "$APACHE_VERSION" -lt 2004001; then +- APXS_MPM=`$APXS -q MPM_NAME` +- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then +- PHP_BUILD_THREAD_SAFE +- fi +- else +- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` +- if test -n "$APACHE_THREADED_MPM"; then +- PHP_BUILD_THREAD_SAFE +- fi +- fi + AC_MSG_RESULT(yes) + PHP_SUBST(APXS) + else @@ -155,7 +155,7 @@ ; track_errors ; Default Value: Off -; Development Value: Off +; Development Value: On ; Production Value: Off ; variables_order @@ -867,22 +867,21 @@ default_socket_timeout = 60 ; If you wish to have an extension loaded automatically, use the following ; syntax: ; -; extension=modulename.extension -; -; For example, on Windows: -; -; extension=msql.dll +; extension=modulename ; -; ... or under UNIX: +; For example: ; -; extension=msql.so +; extension=mysqli ; -; ... or with a path: +; 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/msql.so +; extension=/path/to/extension/mysqli.so ; -; If you only provide the name of the extension, PHP will look for it in its -; default extension directory. +; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and +; 'extension='php_<ext>.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=<ext>) syntax. ;;;; ; Note: packaged extension modules are now loaded via the .ini files @@ -124,13 +124,13 @@ %global db_devel libdb-devel %endif -%global gh_commit cc577749a8c95e6f15f5a859961a995a82828c8e +%global gh_commit c22cda5999eaaaa50df0b7977f51853cbf1988a3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20170827 +%global gh_date 20170828 %global gh_owner php %global gh_project php-src #global rcver beta3 -%global rpmrel 18 +%global rpmrel 19 Summary: PHP scripting language for creating dynamic web sites @@ -1548,7 +1548,7 @@ do else cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} <<EOF ; Enable ${mod} extension module -extension=${mod}.so +extension=${mod} EOF fi cat > files.${mod} <<EOF @@ -1839,7 +1839,11 @@ fi %changelog -* Tue Aug 22 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.18.20170827.cc57774 +* Mon Aug 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.19.20170827.c22cda5 +- test build from git snapshot +- refresh configuration files, sync with upstream, drop .so suffix + +* Sun Aug 27 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.18.20170828.cc57774 - test build from git snapshot * Tue Aug 22 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.17.20170822.3fff74a |