From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 22 Apr 2020 13:08:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c705079b12984dab1901a32b4a0609f2ab8f449a;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79503: Memory leak on duplicate metadata
---

c705079b12984dab1901a32b4a0609f2ab8f449a
diff --cc NEWS
index 7b34c515c0,1831014f24..b6f8f162b7
--- a/NEWS
+++ b/NEWS
@@@ -26,13 -22,8 +26,16 @@@ PH
    . Fixed bug #79497 (stream_socket_client() throws an unknown error sometimes
      with <1s timeout). (Joe Cai)
  
- PCRE:
++- PCRE:
 +  . Upgraded to PCRE2 10.34. (cmb)
 +
+ - Phar:
 -  . Fix bug #79503 (Memory leak on duplicate metadata). (cmb)
++  . Fixed bug #79503 (Memory leak on duplicate metadata). (cmb)
++
 +- SPL:
 +  . Fixed bug #69264 (__debugInfo() ignored while extending SPL classes). (cmb)
 +  . Fixed bug #67369 (ArrayObject serialization drops the iterator class).
 +    (Alex Dowad)
  
  - Standard:
    . Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter