From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 24 Sep 2016 10:46:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC3~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c733f92d729a9388e5290de1d45fcd9afa523330;p=php

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

c733f92d729a9388e5290de1d45fcd9afa523330
diff --cc NEWS
index 6481b0208a,6bff08b6a0..d42a9f409f
--- a/NEWS
+++ b/NEWS
@@@ -17,9 -34,25 +17,10 @@@ PH
    . Fixed bug #73155 (imagegd2() writes wrong chunk sizes on boundaries). (cmb)
    . Fixed bug #73159 (imagegd2(): unrecognized formats may result in corrupted
      files). (cmb)
+   . Fixed bug #73161 (imagecreatefromgd2() may leak memory). (cmb)
  
 -- Mbstring:
 -  . Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
 -  . Fixed bug #66964 (mb_convert_variables() cannot detect recursion) (Yasuo)
 -  . Fixed bug #72992 (mbstring.internal_encoding doesn't inherit default_charset).
 -    (Yasuo)
 -
 -- Mysqlnd:
 -  . Fixed bug #72489 (PHP Crashes When Modifying Array Containing MySQLi Result
 -    Data). (Nikita)
 -
 -- Opcache:
 -  . Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp()
 -    function). (Laruence)
 -
 -- OpenSSL:
 -  . Fixed bug #73072 (Invalid path SNI_server_certs causes segfault).
 -    (Jakub Zelenka)
 +- JSON:
 +  . Fixed bug #73113 (Segfault with throwing JsonSerializable). (julien)
  
  - PCRE:
    . Fixed bug #73121 (Bundled PCRE doesn't compile because JIT isn't supported