From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 26 Nov 2016 15:09:07 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09085ac02ce8f5fe34eb6f5a3dbb0abb5f1d821f;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

09085ac02ce8f5fe34eb6f5a3dbb0abb5f1d821f
diff --cc NEWS
index 4b64511d92,9226c51cb7..1e43c0e976
--- a/NEWS
+++ b/NEWS
@@@ -35,6 -43,12 +35,7 @@@ PH
  
  - PCRE:
    . Fixed bug #73483 (Segmentation fault on pcre_replace_callback). (Laruence)
 -  . Fixed bug #73392 (A use-after-free in zend allocator management). 
 -    (Laruence)
 -
 -- PDO_Firebird:
 -  . Fixed bug #73087, #61183, #71494 (Memory corruption in bindParam).
 -    (Dorin Marcoci)
++  . Fixed bug #73612 (preg_*() may leak memory). (cmb)
  
  - Postgres:
    . Fixed bug #73498 (Incorrect SQL generated for pg_copy_to()). (Craig Duncan)