diff options
| author | Xinchen Hui <laruence@php.net> | 2015-07-09 16:32:18 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-07-09 16:36:31 +0800 |
| commit | 0de0c4ace14437071fb8a8690f387a63c0c48003 (patch) | |
| tree | 1e1a01d375613bad864bf6748aff0005bf4b71d3 | |
| parent | a55ca9a8d14d16708c0627c05e117b26d2aaef86 (diff) | |
| download | php-git-0de0c4ace14437071fb8a8690f387a63c0c48003.tar.gz | |
Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL))
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/soap/php_http.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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) diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 3b42a6bf06..e0a749f83d 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -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; |