From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 25 Oct 2016 12:34:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC5~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c30e5a32c1a68f62a2356eb52965551252f8131c;p=php

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

c30e5a32c1a68f62a2356eb52965551252f8131c
diff --cc NEWS
index 5c044ef2ac,20411a64ce..65f0892192
--- a/NEWS
+++ b/NEWS
@@@ -546,11 -518,9 +546,12 @@@ PH
      (Pierre)
    . Fixed bug #72482 (Ilegal write/read access caused by gdImageAALine
      overflow). (Pierre)
--  . Fixed bug #72494 (imagecropauto out-of-bounds access). (Pierre)
++  . Fixed bug #72494 (imagecropauto out-of-bounds access). (Fernando, Pierre,
++    cmb)
  
  - Intl:
 +  . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
 +    names). (cmb)
    . Fixed bug #72533 (locale_accept_from_http out-of-bounds access). (Stas)
  
  - Mbstring: