From 91d5950c6d91e5a1700829d0a1b58d655b78e5c3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 21 May 2025 07:34:01 +0200
Subject: Update to 8.4.8RC1

use same build tree for fpm and embed
---
 php-8.4.0-httpd.patch | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'php-8.4.0-httpd.patch')

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
      ])
  
-- 
cgit