diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-17 08:56:11 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-17 08:56:11 +0200 |
| commit | 3fadc52c1d1f1060b5b5075d0ccca52c90a6913b (patch) | |
| tree | e398b5e659e465a87d49c62acf486bc074eb769d /php-8.4.0-httpd.patch | |
| parent | 49db863d63ed603fa34d90c0330b9f74397636d8 (diff) | |
Update to 8.4.0alpha2
Diffstat (limited to 'php-8.4.0-httpd.patch')
| -rw-r--r-- | php-8.4.0-httpd.patch | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch index d219faf..06e71df 100644 --- a/php-8.4.0-httpd.patch +++ b/php-8.4.0-httpd.patch @@ -7,20 +7,15 @@ mod_php is build twice diff -up ./sapi/apache2handler/config.m4.mpmcheck ./sapi/apache2handler/config.m4 --- ./sapi/apache2handler/config.m4.mpmcheck 2024-07-03 15:56:56.882370597 +0200 +++ ./sapi/apache2handler/config.m4 2024-07-03 15:59:15.967824949 +0200 -@@ -105,16 +105,4 @@ if test "$PHP_APXS2" != "no"; then - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" +@@ -110,11 +110,6 @@ if test "$PHP_APXS2" != "no"; then ;; esac + +- AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [ +- APACHE_THREADED_MPM=yes +- PHP_BUILD_THREAD_SAFE +- ], [APACHE_THREADED_MPM=no]) - -- 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 - fi + AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],, + [AS_VAR_IF([APACHE_THREADED_MPM], [no], + [AC_MSG_WARN([ |