dmitry Wed May 2 09:38:12 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugs bug41004.phpt bug41004.wsdl
Modified files:
/php-src NEWS
/php-src/ext/soap php_encoding.c
Log:
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.669&r2=1.2027.2.547.2.670&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.669 php-src/NEWS:1.2027.2.547.2.670
--- php-src/NEWS:1.2027.2.547.2.669 Wed May 2 08:22:12 2007
+++ php-src/NEWS Wed May 2 09:38:11 2007
@@ -5,6 +5,7 @@
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
- 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)
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.30&r2=1.103.2.21.2.31&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.30
php-src/ext/soap/php_encoding.c:1.103.2.21.2.31
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.30 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 09:38:12 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.30 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.31 2007/05/02 09:38:12 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 &&
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug41004.phpt
+++ php-src/ext/soap/tests/bugs/bug41004.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.wsdl?view=markup&rev=1.1
Index: php-src/ext/soap/tests/bugs/bug41004.wsdl
+++ php-src/ext/soap/tests/bugs/bug41004.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
