diff options
| author | Remi Collet <remi@remirepo.net> | 2025-05-21 07:34:01 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-05-21 07:34:01 +0200 |
| commit | 91d5950c6d91e5a1700829d0a1b58d655b78e5c3 (patch) | |
| tree | 4c6c93f1e356a15f634850659481187b932b0fb8 /php-8.4.0-httpd.patch | |
| parent | 0a22fcc98207735a360aded1d4ff41857cd12470 (diff) | |
use same build tree for fpm and embed
Diffstat (limited to 'php-8.4.0-httpd.patch')
| -rw-r--r-- | php-8.4.0-httpd.patch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/php-8.4.0-httpd.patch b/php-8.4.0-httpd.patch index 227468c..51e3032 100644 --- a/php-8.4.0-httpd.patch +++ b/php-8.4.0-httpd.patch @@ -1,13 +1,22 @@ Disable MPM detection +mod_php is always build as NTS for prefork -mod_php is build twice -- as NTS without option -- as ZTS using --enable-maintainer-zts +Disable httpd.conf change 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 +--- ./sapi/apache2handler/config.m4.mpmcheck 2025-05-06 14:31:58.000000000 +0200 ++++ ./sapi/apache2handler/config.m4 2025-05-19 15:14:27.710935097 +0200 +@@ -78,8 +78,7 @@ if test "$PHP_APXS2" != "no"; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +- -S SYSCONFDIR='$APXS_SYSCONFDIR' \ +- -i -a -n php" ++ -i -n php" + fi + + LIBPHP_CFLAGS="-shared" +@@ -120,11 +119,6 @@ if test "$PHP_APXS2" != "no"; then -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 ]) |