diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-30 14:13:16 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-30 14:13:31 +0000 |
| commit | 5262bd9ea3c5cecde0f92cf40b31245426173b30 (patch) | |
| tree | f4ed9ee25ff685aedfbfe6866cade0507ebec067 | |
| parent | 63c0ecc44564fbb3469d53646a5403388689ceea (diff) | |
| parent | a308000ff2c7c5bdbe21a840d5def00a42d565aa (diff) | |
| download | php-git-5262bd9ea3c5cecde0f92cf40b31245426173b30.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/soap/soap.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -49,6 +49,9 @@ PHP NEWS - PGSQL: . Fixed bug #75419 (Default link incorrectly cleared/linked by pg_close()). (Sara) +- SOAP: + . Fixed bug #75464 (Wrong reflection on SoapClient::__setSoapHeaders). (villfa) + - Zlib: . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien Villepinte) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 1f857590cd..54ddaf0f1b 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -373,7 +373,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() |