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

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

0f40ca989ab86c24118d1f47aa2c3614a61fa6b6
diff --cc NEWS
index 22fa5086e8,e3d92454df..238bf3e175
--- a/NEWS
+++ b/NEWS
@@@ -22,7 -13,11 +22,8 @@@ 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)