summaryrefslogtreecommitdiff
path: root/ext/soap/php_encoding.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2007-02-15 14:48:12 +0000
committerDmitry Stogov <dmitry@php.net>2007-02-15 14:48:12 +0000
commit2cf92f365a8a010d9bc1f7fb86a1ad8e49d7a7a0 (patch)
treee79dd61f88998ccff2a59756d7ae35b163f1ab4a /ext/soap/php_encoding.c
parenta79d74b694a190804c952caa49d2d190b3c6f120 (diff)
downloadphp-git-2cf92f365a8a010d9bc1f7fb86a1ad8e49d7a7a0.tar.gz
Fixed bug #40467 (Partial SOAP request sent when XSD sequence or choice include minOccurs=0)
Diffstat (limited to 'ext/soap/php_encoding.c')
-rw-r--r--ext/soap/php_encoding.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index aa2b98e887..154a570a35 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1574,8 +1574,10 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
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);
}