From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 23 Sep 2016 21:44:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=456be3ec37c0242635980db1ae33eca993db97cb;p=php

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

456be3ec37c0242635980db1ae33eca993db97cb
diff --cc NEWS
index b9c1c0fe78,b9ef512bd2..5f02649595
--- a/NEWS
+++ b/NEWS
@@@ -30,10 -26,11 +30,11 @@@ PH
      cmb)
    . Fixed bug #53504 (imagettfbbox gives incorrect values for bounding box).
      (Mark Plomer, cmb)
+   . Fixed bug #73157 (imagegd2() ignores 3rd param if 4 are given). (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)