From 0aa7b67d6e3fbf9008a57d5494159d6582e546d2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 Sep 2020 11:25:19 +0200
Subject: Core:   Fix #79699 PHP parses encoded cookie names so malicious
 `__Host-` cookies can be sent   CVE-2020-7070

---
 php56.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'php56.spec')

diff --git a/php56.spec b/php56.spec
index 465049b..c427e2b 100644
--- a/php56.spec
+++ b/php56.spec
@@ -35,8 +35,13 @@
 %global oraclever 18.3
 %endif
 %global oraclelib 18.1
+
+%else
+%ifarch x86_64
+%global oraclever 19.8
 %else
 %global oraclever 19.6
+%endif
 %global oraclelib 19.1
 %endif
 
@@ -152,7 +157,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.6.40
-Release: 22%{?dist}
+Release: 23%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -252,6 +257,7 @@ Patch241: php-bug79465.patch
 Patch242: php-bug78875.patch
 Patch243: php-bug79797.patch
 Patch244: php-bug79877.patch
+Patch246: php-bug79699.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1059,6 +1065,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
 %patch242 -p1 -b .bug78875
 %patch243 -p1 -b .bug79797
 %patch244 -p1 -b .bug79877
+%patch246 -p1 -b .bug79699
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -2115,6 +2122,11 @@ EOF
 
 
 %changelog
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 5.6.40-23
+- Core:
+  Fix #79699 PHP parses encoded cookie names so malicious `__Host-` cookies can be sent
+  CVE-2020-7070
+
 * Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 5.6.40-22
 - Core:
   Fix #79877 getimagesize function silently truncates after a null byte
-- 
cgit