cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c

dmitry Fri May 4 06:19:34 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/soap php_encoding.c Log: - Fixed bug #41097 (ext/soap returning associative array as indexed without using WSDL). - Fixed bug #41004 (minOccurs="0" and null class member variable). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.677&r2=1.2027.2.547.2.678&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.677 php-src/NEWS:1.2027.2.547.2.678 --- php-src/NEWS:1.2027.2.547.2.677 Fri May 4 06:18:52 2007 +++ php-src/NEWS Fri May 4 06:19:34 2007 @@ -4,6 +4,9 @@ - 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 http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.32&r2=1.103.2.21.2.33&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.32 php-src/ext/soap/php_encoding.c:1.103.2.21.2.33 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.32 Wed May 2 17:24:16 2007 +++ php-src/ext/soap/php_encoding.c Fri May 4 06:19:34 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.32 2007/05/02 17:24:16 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.33 2007/05/04 06:19:34 dmitry Exp $ */ #include <time.h> @@ -1595,6 +1595,8 @@ 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 @@ 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));