summaryrefslogtreecommitdiffstats
path: root/php-7.4.0-httpd.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-05-11 10:48:41 +0200
committerRemi Collet <remi@php.net>2022-05-11 10:48:41 +0200
commit43ce9a2b4f9c0878d38d9b064b2c5fc47f04cf7b (patch)
treef4709016b21267bcfafae6fd997ee6234226bcd4 /php-7.4.0-httpd.patch
dup 8.1
Diffstat (limited to 'php-7.4.0-httpd.patch')
-rw-r--r--php-7.4.0-httpd.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/php-7.4.0-httpd.patch b/php-7.4.0-httpd.patch
new file mode 100644
index 0000000..34f7c8a
--- /dev/null
+++ b/php-7.4.0-httpd.patch
@@ -0,0 +1,27 @@
+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
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -105,17 +105,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 2>/dev/null | grep 'threaded:.*yes'`
+- if test -n "$APACHE_THREADED_MPM"; then
+- PHP_BUILD_THREAD_SAFE
+- fi
+- fi
+ AC_MSG_RESULT(yes)
+ PHP_SUBST(APXS)
+ else