diff options
author | Remi Collet <remi@remirepo.net> | 2019-09-05 11:12:58 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-09-05 11:12:58 +0200 |
commit | 18689b68b9beba429739846a90533c0a1dad987d (patch) | |
tree | 581f620b114476737f2c104cbfa2054f022c8494 /php-7.1.7-httpd.patch | |
parent | 12436084f7377048e291406f04fae6dab1812e64 (diff) |
update to 7.4.0RC1
Diffstat (limited to 'php-7.1.7-httpd.patch')
-rw-r--r-- | php-7.1.7-httpd.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/php-7.1.7-httpd.patch b/php-7.1.7-httpd.patch deleted file mode 100644 index acb3d2c..0000000 --- a/php-7.1.7-httpd.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 |