From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 17 Feb 2020 18:36:07 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8db8d66df0e4b7cf202120273ab9c5d01a3f0d1c;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix NEWS [ci skip]
---

8db8d66df0e4b7cf202120273ab9c5d01a3f0d1c
diff --cc NEWS
index 9c22f96c1d,29d0f3d9af..b56bb2134f
--- a/NEWS
+++ b/NEWS
@@@ -25,20 -17,7 +25,10 @@@ PH
  - PCRE:
    . Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback
      and unicode). (Nikita)
 +  . Fixed bug #79241 (Segmentation fault on preg_match()). (Nikita)
 +  . Fixed bug #79257 (Duplicate named groups (?J) prefer last alternative even
 +    if not matched). (Nikita)
  
- - Phar:
-   . Fixed bug #79082 (Files added to tar with Phar::buildFromIterator have
-     all-access permissions). (CVE-2020-7063) (stas)
-   . Fixed bug #79171 (heap-buffer-overflow in phar_extract_file).
-     (CVE-	2020-7061) (cmb)
- 
- - Session:
-   . Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress).
-     (CVE-2020-7062) (stas)
- 
  - Standard:
    . Fixed bug #79254 (getenv() w/o arguments not showing changes). (cmb)
  
@@@ -103,9 -63,16 +97,13 @@@
    . Fixed bug #79115 (ReflectionClass::isCloneable call reflected class
      __destruct). (Nikita)
  
+ - Session:
+   . Fixed bug #79221 (Null Pointer Dereference in PHP Session Upload Progress).
+     (CVE-2020-7062) (stas)
+ 
 -- SPL:
 -  . Fixed bug #79151 (heap use after free caused by
 -    spl_dllist_it_helper_move_forward). (Nikita)
 -
  - Standard:
    . Fixed bug #78902 (Memory leak when using stream_filter_append). (liudaixiao)
 +  . Fixed bug #78969 (PASSWORD_DEFAULT should match PASSWORD_BCRYPT instead of being null). (kocsismate)
  
  - Testing:
    . Fixed bug #78090 (bug45161.phpt takes forever to finish). (cmb)