summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php-bug62172.patch59
-rw-r--r--php.spec9
3 files changed, 6 insertions, 64 deletions
diff --git a/failed.txt b/failed.txt
index 7693581..da72ae3 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 5.6.18 (2016-02-03)
+===== 5.6.19RC1 (2016-02-18)
$ grep -r 'Tests failed' /var/lib/mock/scl56*/build.log
diff --git a/php-bug62172.patch b/php-bug62172.patch
deleted file mode 100644
index 81ccc35..0000000
--- a/php-bug62172.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 07d2dcdf09fcfbd617031bd341384efb236de12c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Fri, 29 Jan 2016 10:20:42 +0100
-Subject: [PATCH] Fixed Bug #62172 FPM not working with Apache httpd 2.4
- balancer/fcgi setup
-
-Only needed with Apache version < 2.4.12 (ex RHEL-7)
----
- sapi/fpm/fpm/fpm_main.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
-index f3c8ccc..d12ac01 100644
---- a/sapi/fpm/fpm/fpm_main.c
-+++ b/sapi/fpm/fpm/fpm_main.c
-@@ -1108,11 +1108,14 @@ static void init_request_info(TSRMLS_D)
- }
-
- #define APACHE_PROXY_FCGI_PREFIX "proxy:fcgi://"
-- /* Fix proxy URLs in SCRIPT_FILENAME generated by Apache mod_proxy_fcgi:
-+#define APACHE_PROXY_BALANCER_PREFIX "proxy:balancer://"
-+ /* Fix proxy URLs in SCRIPT_FILENAME generated by Apache mod_proxy_fcgi and mod_proxy_balancer:
- * proxy:fcgi://localhost:9000/some-dir/info.php/test?foo=bar
-+ * proxy:balancer://localhost:9000/some-dir/info.php/test?foo=bar
- * should be changed to:
- * /some-dir/info.php/test
- * See: http://bugs.php.net/bug.php?id=54152
-+ * http://bugs.php.net/bug.php?id=62172
- * https://issues.apache.org/bugzilla/show_bug.cgi?id=50851
- */
- if (env_script_filename &&
-@@ -1136,6 +1139,27 @@ static void init_request_info(TSRMLS_D)
- }
- }
-
-+ if (env_script_filename &&
-+ strncasecmp(env_script_filename, APACHE_PROXY_BALANCER_PREFIX, sizeof(APACHE_PROXY_BALANCER_PREFIX) - 1) == 0) {
-+ /* advance to first character of hostname */
-+ char *p = env_script_filename + (sizeof(APACHE_PROXY_BALANCER_PREFIX) - 1);
-+ while (*p != '\0' && *p != '/') {
-+ p++; /* move past hostname and port */
-+ }
-+ if (*p != '\0') {
-+ /* Copy path portion in place to avoid memory leak. Note
-+ * that this also affects what script_path_translated points
-+ * to. */
-+ memmove(env_script_filename, p, strlen(p) + 1);
-+ apache_was_here = 1;
-+ }
-+ /* ignore query string if sent by Apache (RewriteRule) */
-+ p = strchr(env_script_filename, '?');
-+ if (p) {
-+ *p =0;
-+ }
-+ }
-+
- if (CGIG(fix_pathinfo)) {
- struct stat st;
- char *real_path = NULL;
diff --git a/php.spec b/php.spec
index a7d7f44..0bc2bba 100644
--- a/php.spec
+++ b/php.spec
@@ -137,12 +137,12 @@
%global db_devel libdb-devel
%endif
-#global rcver RC1
+%global rcver RC1
%global rpmrel 1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
-Version: 5.6.18
+Version: 5.6.19
%if 0%{?rcver:1}
Release: 0.%{rpmrel}.%{rcver}%{?dist}
%else
@@ -209,7 +209,6 @@ Patch300: php-5.6.3-datetests.patch
Patch301: php-5.6.0-oldpcre.patch
# WIP
-Patch401: php-bug62172.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -911,7 +910,6 @@ support for using the enchant library to PHP.
%endif
# WIP patch
-%patch401 -p1 -b .bug62172
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1806,6 +1804,9 @@ fi
%changelog
+* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> 5.6.19-0.1.RC1
+- update to 5.6.19RC1
+
* Wed Feb 3 2016 Remi Collet <remi@fedoraproject.org> 5.6.18-1
- Update to 5.6.18
http://www.php.net/releases/5_6_18.php