summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bug76582.patch23
-rw-r--r--php.spec7
2 files changed, 29 insertions, 1 deletions
diff --git a/bug76582.patch b/bug76582.patch
new file mode 100644
index 0000000..fd35f43
--- /dev/null
+++ b/bug76582.patch
@@ -0,0 +1,23 @@
+From 23b057742e3cf199612fa8050ae86cae675e214e Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas@php.net>
+Date: Sat, 28 Jul 2018 22:16:29 -0700
+Subject: [PATCH] Fix for bug #76582
+
+The brigade seems to end up in a messed up state if something fails
+in shutdown, so we clean it up.
+---
+ sapi/apache2handler/sapi_apache2.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
+index 6fa2521c3847..0ebca9bca863 100644
+--- a/sapi/apache2handler/sapi_apache2.c
++++ b/sapi/apache2handler/sapi_apache2.c
+@@ -678,6 +678,7 @@ zend_first_try {
+ if (!parent_req) {
+ php_apache_request_dtor(r TSRMLS_CC);
+ ctx->request_processed = 1;
++ apr_brigade_cleanup(brigade);
+ bucket = apr_bucket_eos_create(r->connection->bucket_alloc);
+ APR_BRIGADE_INSERT_TAIL(brigade, bucket);
+
diff --git a/php.spec b/php.spec
index ab7fee8..b072c74 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: 5.5.38
-Release: 8%{?dist}
+Release: 9%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -249,6 +249,7 @@ Patch153: bug73773.patch
Patch154: bug69090.patch
Patch155: bug73549.patch
Patch156: bug75981.patch
+Patch157: bug76582.patch
# Security fixes (200+)
@@ -998,6 +999,7 @@ support for using the enchant library to PHP.
%patch154 -p1 -b .bug69090
%patch155 -p1 -b .bug73549
%patch156 -p1 -b .bug75981
+%patch157 -p1 -b .bug75981
: ------------------------
# Fixes for tests
@@ -1909,6 +1911,9 @@ EOF
%changelog
+* Fri Sep 14 2018 Remi Collet <remi@remirepo.net> - 5.5.38-9
+- fix #76582: XSS due to the header Transfer-Encoding: chunked
+
* Thu Mar 1 2018 Remi Collet <remi@remirepo.net> - 5.5.38-8
- fix #73549: Use after free when stream is passed to imagepng
- fix #75981: stack-buffer-overflow while parsing HTTP response