From 0710a637220022e39dec30ecc856ac71c7882dd0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 Jul 2024 16:50:39 +0200
Subject: Update to 8.4.0alpha1

drop imap, pspell, oci8 and pdo_oci extensions
---
 php-8.4.0-httpd.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 php-8.4.0-httpd.patch

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

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