summaryrefslogtreecommitdiffstats
path: root/php-7.1.7-httpd.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-28 16:46:28 +0200
committerRemi Collet <remi@remirepo.net>2017-08-28 16:46:28 +0200
commitd065c5413c9d99206cbe8fc2c92374209f7edf49 (patch)
tree0243d52295d370abfb5e1b39ae51f393e39b13b0 /php-7.1.7-httpd.patch
parentf1e81da46b2fdb6726422486863981fcc0b28ed3 (diff)
refresh configuration files, sync with upstream, drop .so suffix
Diffstat (limited to 'php-7.1.7-httpd.patch')
-rw-r--r--php-7.1.7-httpd.patch28
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