diff options
| author | Remi Collet <remi@remirepo.net> | 2024-09-23 15:31:00 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-09-23 15:31:00 +0200 |
| commit | 740a14090dec83951484a2705d7ffc7555ebb768 (patch) | |
| tree | 7768a1c01872b781aaa4d530dd0cac8fe3bd7e3d /php-8.4.0-httpd.patch | |
| parent | 16b62b61c0de11f9b89c4805a9b37e9bbc2ec12f (diff) | |
update to 8.4.0beta5
drop oci8, pdo_oci8, pspell and imap extensions
disable ZTS build
Diffstat (limited to 'php-8.4.0-httpd.patch')
| -rw-r--r-- | php-8.4.0-httpd.patch | 21 |
1 files changed, 21 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..227468c --- /dev/null +++ b/php-8.4.0-httpd.patch @@ -0,0 +1,21 @@ +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 +@@ -120,11 +120,6 @@ if test "$PHP_APXS2" != "no"; then + -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 + ]) + +- AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [ +- APACHE_THREADED_MPM=yes +- enable_zts=yes +- ], [APACHE_THREADED_MPM=no]) +- + AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],, + [AS_VAR_IF([APACHE_THREADED_MPM], [no], + [AC_MSG_WARN([ |