From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 10 Oct 2016 09:44:58 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC4~71^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb08216b0802d71f394908a89f987617a7784988;p=php

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

fb08216b0802d71f394908a89f987617a7784988
diff --cc NEWS
index acf58500a9,9fc658ec7b..e3d92454df
--- a/NEWS
+++ b/NEWS
@@@ -13,10 -6,8 +13,11 @@@ PH
    . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb)
    . Fixed bug #73272 (imagescale() is not affected by, but affects
      imagesetinterpolation()). (cmb)
+   . Fixed bug #73279 (Integer overflow in gdImageScaleBilinearPalette()). (cmb)
  
 +- phpdbg:
 +  . Properly allow for stdin input from a file. (Bob)
 +
  - Standard:
    . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)