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

---
 php.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 6e3c4d4..da48921 100644
--- a/php.spec
+++ b/php.spec
@@ -86,12 +86,7 @@
 # Optional components; pass "--with mssql" etc to rpmbuild.
 %global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
 %global with_imap      1
-# until firebird available in EPEL
-%if 0%{?rhel} == 8
-%global with_interbase 0
-%else
 %global with_interbase 1
-%endif
 %global with_mcrypt    1
 %global with_freetds   1
 %global with_tidy      1
@@ -146,7 +141,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-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
@@ -256,6 +251,7 @@ Patch242: php-bug78875.patch
 Patch243: php-bug78876.patch
 Patch244: php-bug79797.patch
 Patch245: php-bug79877.patch
+Patch246: php-bug79699.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1044,6 +1040,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch243 -p1 -b .bug78876
 %patch244 -p1 -b .bug79797
 %patch245 -p1 -b .bug79877
+%patch246 -p1 -b .bug79699
 : ---------------------------
 #exit 1
 
@@ -2002,6 +1999,11 @@ EOF
 
 
 %changelog
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.0.33-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> - 7.0.33-22
 - Core:
   Fix #79877 getimagesize function silently truncates after a null byte
-- 
cgit