dmitry Tue Mar 20 07:51:32 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug36226-2.phpt bug36226-2.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #36226 (Inconsistent handling when passing nillable arrays)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.603&r2=1.2027.2.547.2.604&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.603 php-src/NEWS:1.2027.2.547.2.604
--- php-src/NEWS:1.2027.2.547.2.603 Tue Mar 20 06:46:48 2007
+++ php-src/NEWS Tue Mar 20 07:51:31 2007
@@ -104,6 +104,8 @@
- Fixed bug #38406 (crash when assigning objects to SimpleXML attributes).
(Tony)
- Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)
- Fixed bug #36496 (SSL support in imap_open() not working on Windows). (Edin)
+- Fixed bug #36226 (Inconsistent handling when passing nillable arrays).
+ (Dmitry)
- Fixed bug #35872 (Avoid crash caused by object store being referenced during
RSHUTDOWN) (Andy)
- Fixed bug #34794 (proc_close() hangs when used with two processes).
(jdolecek at netbsd dot org, Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.24&r2=1.103.2.21.2.25&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.24
php-src/ext/soap/php_encoding.c:1.103.2.21.2.25
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.24 Sun Feb 25 13:19:29 2007
+++ php-src/ext/soap/php_encoding.c Tue Mar 20 07:51:31 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.24 2007/02/25 13:19:29 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.25 2007/03/20 07:51:31 dmitry Exp $ */
#include <time.h>
@@ -1221,7 +1221,8 @@
add_next_index_zval(array, val);
} while ((node =
get_node(node->next, model->u.element->name)) != NULL);
val = array;
- } else if ((SOAP_GLOBAL(features) &
SOAP_SINGLE_ELEMENT_ARRAYS) &&
+ } else if ((Z_TYPE_P(val) != IS_NULL ||
!model->u.element->nillable) &&
+ (SOAP_GLOBAL(features) &
SOAP_SINGLE_ELEMENT_ARRAYS) &&
(model->max_occurs == -1 ||
model->max_occurs > 1)) {
zval *array;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug36226-2.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug36226-2.phpt
+++ php-src/ext/soap/tests/bugs/bug36226-2.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug36226-2.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug36226-2.wsdl
+++ php-src/ext/soap/tests/bugs/bug36226-2.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
