diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-30 14:13:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-30 14:14:21 +0000 |
| commit | 118db2d2f7426e4c0b1f84a06ce79171114c81b8 (patch) | |
| tree | 0a8996f41e1f441cdfe05e59f2cd23b1461c1187 | |
| parent | 1a72d3225cfe03edcfcab49070bd7a6806b7958d (diff) | |
| parent | 5262bd9ea3c5cecde0f92cf40b31245426173b30 (diff) | |
| download | php-git-118db2d2f7426e4c0b1f84a06ce79171114c81b8.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | ext/soap/soap.c | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -9,10 +9,16 @@ PHP NEWS - GD: . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte) +- interbase: + . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa) + - Mysqli: . Fixed bug #75434 (Wrong reflection for mysqli_fetch_all function). (Fabien Villepinte) +- SOAP: + . Fixed bug #75464 (Wrong reflection on SoapClient::__setSoapHeaders). (villfa) + 26 Oct 2017, PHP 7.2.0RC5 - Core: @@ -47,9 +53,6 @@ PHP NEWS . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead of destination). (andrewnester) -- interbase: - . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa) - - JSON: . Fixed bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key). (Jakub Zelenka) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 3c7e847964..f7516c75e4 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -366,7 +366,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getcookies, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setsoapheaders, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setsoapheaders, 0, 0, 0) ZEND_ARG_INFO(0, soapheaders) ZEND_END_ARG_INFO() |