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

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

be4489d48880626501cd6c560cd08cccd3002aea
diff --cc NEWS
index 0528fede4a,1bbb1f4b2b..b9c1c0fe78
--- a/NEWS
+++ b/NEWS
@@@ -28,10 -24,12 +28,12 @@@ PH
      alphablending). (cmb)
    . Fixed bug #73003 (Integer Overflow in gdImageWebpCtx of gd_webp.c). (trylab,
      cmb)
+   . Fixed bug #53504 (imagettfbbox gives incorrect values for bounding box).
+     (Mark Plomer, 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)