diff options
author | Remi Collet <remi@remirepo.net> | 2018-01-02 12:48:22 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2018-01-02 12:48:22 +0100 |
commit | aca561adca6601aab1973edd5b3f9cc4b973b620 (patch) | |
tree | 33f36f6ef46078d8fdf562ba8b1ecc651507247b /php-7.1.7-httpd.patch | |
parent | 133b35cc72988e35b843bbbde171994a57170e16 (diff) |
v7.0.27
Diffstat (limited to 'php-7.1.7-httpd.patch')
-rw-r--r-- | php-7.1.7-httpd.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 |