diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-06-13 17:16:13 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-13 17:16:13 +0300 |
| commit | 84b9b164a80fe4f9ec10e729a0d2386cc75254dd (patch) | |
| tree | 0db65f7f6e69ce46298cdcf561d4864fdd0b645b | |
| parent | 6408c66d3c2b73f3e08e17365d91105e09ae2b9d (diff) | |
| parent | 648be8600ff89e1b0e4a4ad25cebad42b53bed6d (diff) | |
| download | php-git-84b9b164a80fe4f9ec10e729a0d2386cc75254dd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/soap/php_sdl.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -48,6 +48,10 @@ PHP NEWS - PHAR: . Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa) +- SOAP + . Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY). + (Dmitry) + - Streams: . Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara) diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 22bcede681..b8f1911f69 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2623,7 +2623,7 @@ static sdlAttributePtr make_persistent_sdl_attribute(sdlAttributePtr attr, HashT pattr->extraAttributes = malloc(sizeof(HashTable)); zend_hash_init(pattr->extraAttributes, zend_hash_num_elements(attr->extraAttributes), NULL, delete_extra_attribute_persistent, 1); - ZEND_HASH_FOREACH_STR_KEY_PTR(pattr->extraAttributes, key, tmp) { + ZEND_HASH_FOREACH_STR_KEY_PTR(attr->extraAttributes, key, tmp) { if (key) { pextra = malloc(sizeof(sdlExtraAttribute)); memset(pextra, 0, sizeof(sdlExtraAttribute)); |