cvs: php-src /ext/soap php_encoding.c
| From: | Dmitry Stogov | Date: | Thu, 15 Feb 2007 14:49:13 +0000 |
| Subject: | cvs: php-src /ext/soap php_encoding.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43074@lists.php.net to get a copy of this message | ||
dmitry Thu Feb 15 14:49:13 2007 UTC
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #40467 (Partial SOAP request sent when XSD sequence or choice include minOccurs=0)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.151&r2=1.152&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.151 php-src/ext/soap/php_encoding.c:1.152
--- php-src/ext/soap/php_encoding.c:1.151 Mon Jan 1 09:29:29 2007
+++ php-src/ext/soap/php_encoding.c Thu Feb 15 14:49:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.151 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: php_encoding.c,v 1.152 2007/02/15 14:49:13 dmitry Exp $ */
#include <time.h>
@@ -1541,8 +1541,10 @@
zend_hash_internal_pointer_reset_ex(model->u.content, &pos);
while (zend_hash_get_current_data_ex(model->u.content, (void**)&tmp, &pos) ==
SUCCESS) {
- if (!model_to_xml_object(node, *tmp, object, style, model->min_occurs > 0 TSRMLS_CC)) {
- return 0;
+ if (!model_to_xml_object(node, *tmp, object, style, (*tmp)->min_occurs > 0 TSRMLS_CC)) {
+ if ((*tmp)->min_occurs > 0) {
+ return 0;
+ }
}
zend_hash_move_forward_ex(model->u.content, &pos);
}