diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-05-04 06:19:34 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-05-04 06:19:34 +0000 |
| commit | 97b338afe52befbbef2fb86b35b2bfb4f40f1922 (patch) | |
| tree | f9e29a4acd30ffe4b485673d39132cbe67f7ac26 | |
| parent | d8ce0568ef745a9cc1815c8387f4f83e3339280d (diff) | |
| download | php-git-97b338afe52befbbef2fb86b35b2bfb4f40f1922.tar.gz | |
- Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL).
- Fixed bug #41004 (minOccurs="0" and null class member variable).
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/soap/php_encoding.c | 10 |
2 files changed, 11 insertions, 2 deletions
@@ -4,6 +4,9 @@ PHP NEWS - Fixed ext/filter Email Validation Vulnerability (MOPB-24 by Stefan Esser) (Ilia) - Fixed altering $this via argument named "this". (Dmitry) +- Fixed bug #41097 (ext/soap returning associative array as indexed without + using WSDL). (Dmitry) +- Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry) 03 May 2007, PHP 5.2.2 - Improved bundled GD diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 2ae06a768a..6a2c71d583 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1595,6 +1595,8 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval * property = xmlNewNode(NULL, BAD_CAST("BOGUS")); xmlAddChild(node, property); set_xsi_nil(property); + } else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) { + return 1; } else { property = master_to_xml(enc, data, style, node); if (property->children && property->children->content && @@ -3356,8 +3358,12 @@ static int is_map(zval *array) int i, count = zend_hash_num_elements(Z_ARRVAL_P(array)); zend_hash_internal_pointer_reset(Z_ARRVAL_P(array)); - for (i = 0;i < count;i++) { - if (zend_hash_get_current_key_type(Z_ARRVAL_P(array)) == HASH_KEY_IS_STRING) { + for (i = 0; i < count; i++) { + char *str_index; + ulong num_index; + + if (zend_hash_get_current_key(Z_ARRVAL_P(array), &str_index, &num_index, 0) == HASH_KEY_IS_STRING || + num_index != i) { return TRUE; } zend_hash_move_forward(Z_ARRVAL_P(array)); |