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

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

394e9b3d15758dbf24dbe53f30d68962534ea501
diff --cc NEWS
index 6606e88d8c,46fddef86f..6481b0208a
--- a/NEWS
+++ b/NEWS
@@@ -15,9 -32,26 +15,11 @@@ PH
      (Mark Plomer, cmb)
    . Fixed bug #73157 (imagegd2() ignores 3rd param if 4 are given). (cmb)
    . Fixed bug #73155 (imagegd2() writes wrong chunk sizes on boundaries). (cmb)
+   . Fixed bug #73159 (imagegd2(): unrecognized formats may result in corrupted
+     files). (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