From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 30 Sep 2016 21:46:28 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC4~102^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12967bc3465cd469bb0a130173b17d7b2b3bf755;p=php

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

12967bc3465cd469bb0a130173b17d7b2b3bf755
diff --cc NEWS
index d4b7873683,e9e4b9486f..823baa9304
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,10 +1,14 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2016, PHP 5.6.28
 +?? ??? 2016 PHP 7.0.13
  
 --GD:
 +- Core:
 +  . Fixed bug #73181 (parse_str() without a second argument leads to crash).
 +    (Nikita)
 +
++- GD:
+   . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb)
+ 
  - Standard:
    . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)