From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 24 Sep 2016 09:31:11 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61722743f455743b096f38c5f9e6944aa00dcd6a;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

61722743f455743b096f38c5f9e6944aa00dcd6a
diff --cc NEWS
index 10dbc79eb7,a7a71846bb..46fddef86f
--- a/NEWS
+++ b/NEWS
@@@ -32,10 -28,12 +32,12 @@@ 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 #72994 (mbc_to_code() out of bounds read). (Laruence, cmb)
 -  . Fixed bug #66964 (mb_convert_variables() cannot detect recursion). (Yasuo)
 +  . 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)