From 8271e713970acd9814e4dc91d2ebfa4230da2c2d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Aug 2017 16:49:53 +0200
Subject: Update to 7.0.23 - http://www.php.net/releases/7_0_23.php

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

diff --git a/failed.txt b/failed.txt
index 489df21..fa5d66e 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.0.23RC1 (2017-08-17)
+===== 7.0.23 (2017-08-31)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
 
@@ -8,10 +8,11 @@ $ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc25x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc26x/build.log:Tests failed    :    0
-/var/lib/mock/scl70fc27x/build.log:Tests failed    :    1
+/var/lib/mock/scl70fc27x/build.log:Tests failed    :    2
 
 
 fc27x
+	1	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
 	4	substr_compare() [ext/standard/tests/strings/substr_compare.phpt]
 
 
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/php.spec b/php.spec
index b328abf..c395fb1 100644
--- a/php.spec
+++ b/php.spec
@@ -121,7 +121,7 @@
 %endif
 
 %global upver        7.0.23
-%global rcver        RC1
+#global rcver        RC1
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -1808,6 +1808,9 @@ fi
 
 
 %changelog
+* Tue Aug 29 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23-1
+- Update to 7.0.23 - http://www.php.net/releases/7_0_23.php
+
 * Wed Aug 16 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23~RC1-2
 - disable httpd MPM check
 
-- 
cgit