From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 2 Feb 2017 17:14:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d1955796ea00ce8f718502d583394ad0d05d266;p=php

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

2d1955796ea00ce8f718502d583394ad0d05d266
diff --cc ext/gd/gd.c
index 72c0083cad,ec2a037357..9d0dcca690
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -367,7 -367,9 +367,9 @@@ ZEND_END_ARG_INFO(
  #ifdef HAVE_GD_PNG
  ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1)
  	ZEND_ARG_INFO(0, im)
 -	ZEND_ARG_INFO(0, filename)
 +	ZEND_ARG_INFO(0, to)
+ 	ZEND_ARG_INFO(0, quality)
+ 	ZEND_ARG_INFO(0, filters)
  ZEND_END_ARG_INFO()
  #endif