diff options
author | Nikita Popov <nikic@php.net> | 2016-11-20 21:18:48 +0100 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2016-11-20 21:19:20 +0100 |
commit | 47252a1e7489718c8c9db3b92b78df2e2e116936 (patch) | |
tree | 12cca5d57f346fb15504af77ab5c097db9564d79 /ext/soap/soap.c | |
parent | ce4869f0388e500abf39094ab48ae6769a2ed71f (diff) | |
parent | 685b1292e9a050ec413662c4b7dcf69030d2010c (diff) | |
download | php-git-47252a1e7489718c8c9db3b92b78df2e2e116936.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/soap/soap.c')
-rw-r--r-- | ext/soap/soap.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 52b4dcbef4..48733def55 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -3207,12 +3207,8 @@ PHP_METHOD(SoapClient, __setSoapHeaders) if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) { zend_hash_str_del(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1); } else if (Z_TYPE_P(headers) == IS_ARRAY) { - zval *default_headers; - verify_soap_headers_array(Z_ARRVAL_P(headers)); - if ((default_headers = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) == NULL) { - add_property_zval(this_ptr, "__default_headers", headers); - } + add_property_zval(this_ptr, "__default_headers", headers); } else if (Z_TYPE_P(headers) == IS_OBJECT && instanceof_function(Z_OBJCE_P(headers), soap_header_class_entry)) { zval default_headers; |