diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-03 16:50:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-03 16:50:39 +0200 |
| commit | 0710a637220022e39dec30ecc856ac71c7882dd0 (patch) | |
| tree | 46cf0a85dd61acd006925b521aac9fa2f5e10504 /php-8.4.0-httpd.patch | |
| parent | 6f35cdb5bbd4a88c10617bbda37bcb37f96a4fbd (diff) | |
Update to 8.4.0alpha1
drop imap, pspell, oci8 and pdo_oci extensions
Diffstat (limited to 'php-8.4.0-httpd.patch')
| -rw-r--r-- | php-8.4.0-httpd.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch new file mode 100644 index 0000000..d219faf --- /dev/null +++ b/php-8.4.0-httpd.patch @@ -0,0 +1,26 @@ +Disable MPM detection + +mod_php is build twice +- as NTS without option +- as ZTS using --enable-maintainer-zts + +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" + ;; + 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 + fi |