dmitry Wed May 2 08:22:13 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug41097.phpt
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c soap.c
Log:
Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.668&r2=1.2027.2.547.2.669&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.668 php-src/NEWS:1.2027.2.547.2.669
--- php-src/NEWS:1.2027.2.547.2.668 Mon Apr 30 20:01:16 2007
+++ php-src/NEWS Wed May 2 08:22:12 2007
@@ -3,6 +3,8 @@
?? Apr 2007, PHP 5.2.3RC3
- Fixed iterator_apply() with a callback using __call(). (Johannes)
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
+- Fixed bug #41097 (ext/soap returning associative array as indexed without
+ using WSDL). (Dmitry)
26 Apr 2007, PHP 5.2.2RC2
- Added GMP_VERSION constant. (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.29&r2=1.103.2.21.2.30&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.29
php-src/ext/soap/php_encoding.c:1.103.2.21.2.30
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.29 Fri Apr 6 18:27:58 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 08:22:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.29 2007/04/06 18:27:58 andrei Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.30 2007/05/02 08:22:13 dmitry Exp $ */
#include <time.h>
@@ -3356,8 +3356,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));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.22&r2=1.156.2.28.2.23&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.22
php-src/ext/soap/soap.c:1.156.2.28.2.23
--- php-src/ext/soap/soap.c:1.156.2.28.2.22 Mon Apr 2 13:43:08 2007
+++ php-src/ext/soap/soap.c Wed May 2 08:22:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.22 2007/04/02 13:43:08 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -654,6 +654,8 @@
REGISTER_LONG_CONSTANT("XSD_ANYTYPE", XSD_ANYTYPE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("XSD_ANYXML", XSD_ANYXML, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("APACHE_MAP", APACHE_MAP, CONST_CS |
CONST_PERSISTENT);
+
REGISTER_LONG_CONSTANT("SOAP_ENC_OBJECT", SOAP_ENC_OBJECT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SOAP_ENC_ARRAY", SOAP_ENC_ARRAY, CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41097.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug41097.phpt
+++ php-src/ext/soap/tests/bugs/bug41097.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
