From 269023aeda14ed466209026bab7902b479bc2957 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 Jan 2018 13:18:13 +0100
Subject: v5.6.33

---
 failed.txt            |  2 +-
 php-7.1.7-httpd.patch | 28 ++++++++++++++++++++++++++++
 php56.spec            | 10 ++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 php-7.1.7-httpd.patch

diff --git a/failed.txt b/failed.txt
index 34984b2..8639cbe 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 5.6.32 (2017-10-26)
+===== 5.6.33 (2018-01-04)
 
 $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 
diff --git a/php-7.1.7-httpd.patch b/php-7.1.7-httpd.patch
new file mode 100644
index 0000000..acb3d2c
--- /dev/null
+++ b/php-7.1.7-httpd.patch
@@ -0,0 +1,28 @@
+Disable MPM detection
+
+mod_php is build twice
+- as NTS without option
+- as ZTS using --enable-maintainer-zts
+
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index 2e64b21..ec4799f 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then
+     ;;
+   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 | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  fi
+   AC_MSG_RESULT(yes)
+   PHP_SUBST(APXS)
+ else
diff --git a/php56.spec b/php56.spec
index daf6836..680dc45 100644
--- a/php56.spec
+++ b/php56.spec
@@ -148,7 +148,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.6.32
+Version: 5.6.33
 %if 0%{?rcver:1}
 Release: 0.%{rpmrel}.%{rcver}%{?dist}
 %else
@@ -187,6 +187,7 @@ Source51: opcache-default.blacklist
 Source99: php-fpm.init
 
 # Build fixes
+Patch1: php-7.1.7-httpd.patch
 Patch5: php-5.6.3-includedir.patch
 Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
@@ -941,11 +942,9 @@ support for using the enchant library to PHP.
 %prep
 echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzip}
 
-# ensure than current httpd use prefork MPM.
-httpd -V  | grep -q 'threaded:.*yes' && exit 1
-
 %setup -q -n php-%{version}%{?rcver}
 
+%patch1 -p1 -b .mpmcheck
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -2000,6 +1999,9 @@ fi
 
 
 %changelog
+* Wed Jan  3 2018 Remi Collet <remi@fedoraproject.org> 5.6.33-1
+- Update to 5.6.33 - http://www.php.net/releases/5_6_33.php
+
 * Wed Oct 25 2017 Remi Collet <remi@fedoraproject.org> 5.6.32-1
 - Update to 5.6.32 - http://www.php.net/releases/5_6_32.php
 
-- 
cgit