Merge branch 'PHP-5.6' into PHP-7.0

diff --cc NEWS
index 8117d60f2dea8ffcc09cec04d65ded599126bb5f,a41168d066cf86adfa7b7ee590ad4c83deaf8160..acf58500a9e303e70ee979ffd7842e31ee9a5242
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,20 -1,12 +1,22 @@@
  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)
 +  . Fixed bug #66773 (Autoload with Opcache allows importing conflicting class
 +    name to namespace). (Nikita)
 +  . Fixed bug #66862 ((Sub-)Namespaces unexpected behaviour). (Nikita)
 +
 +- GD:
    . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb)
+   . Fixed bug #73272 (imagescale() is not affected by, but affects
+     imagesetinterpolation()). (cmb)
  
 +- phpdbg:
 +  . Properly allow for stdin input from a file. (Bob)
 +
  - Standard:
    . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)
  

diff --cc ext/gd/gd.c
index 62433c58bab221268d8a3c35370e366549a27e4f,39cb4eb05331f33c438a0d76478696795d5404f0..2aa03a95519ecf7120f74c229c3fa7999bab3175
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -4694,10 -5174,10 +4694,10 @@@ PHP_FUNCTION(imagescale
        gdImagePtr im;
        gdImagePtr im_scaled = NULL;
        int new_width, new_height;
 -      long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
 +      zend_long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
-       gdInterpolationMethod method;
+       gdInterpolationMethod method, old_method;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE)  {
 +      if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE)  {
                return;
        }
        method = tmp_m;