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

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

c930714cbed793ad8272b664dbadaba5477ae40a
diff --cc NEWS
index 8117d60f2d,a41168d066..acf58500a9
--- a/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 62433c58ba,39cb4eb053..2aa03a9551
--- a/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;