]> granicus.if.org Git - php/commitdiff
Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL))
authorXinchen Hui <laruence@php.net>
Thu, 9 Jul 2015 08:32:18 +0000 (16:32 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 9 Jul 2015 08:36:31 +0000 (16:36 +0800)
NEWS
ext/soap/php_http.c

diff --git a/NEWS b/NEWS
index ceca8ad4c98dc7a0d097383ca4afc6d37e76e578..5237eabb31e4202a882c85869c95d1b36354512b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@
 - Core:
   . Fixed bug #70012 (Exception lost with nested finally block). (Laruence)
 
+- Soap:
+  . Fixed bug #70032 (make_http_soap_request calls
+    zend_hash_get_current_key_ex(,,,NULL). (Laruence)
+
 - Standard:
   . Fixed bug #70018 (exec does not strip all whitespace). (Laruence)
 
index 3b42a6bf06407ec7960ea4c2f396ef51895bda2e..e0a749f83df86cc1e95f8929c98b29ddb6d828fa 100644 (file)
@@ -814,7 +814,7 @@ try_again:
                                smart_str_append_const(&soap_headers, "Cookie: ");
                                for (i = 0; i < n; i++) {
                                        data = zend_hash_get_current_data(Z_ARRVAL_P(cookies));
-                                       zend_hash_get_current_key_ex(Z_ARRVAL_P(cookies), &key, NULL, NULL);
+                                       zend_hash_get_current_key(Z_ARRVAL_P(cookies), &key, NULL);
 
                                        if (Z_TYPE_P(data) == IS_ARRAY) {
                                          zval *value;