diff options
| author | Dmitry Stogov <dmitry@tpl2.home> | 2012-09-03 11:51:17 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@tpl2.home> | 2012-09-03 11:51:17 +0400 |
| commit | 33db8c0ef6f46917349fbe07514a06f4f98bff85 (patch) | |
| tree | 9f89412a39746639199387faef4b1219363c4f33 /ext/soap/php_encoding.c | |
| parent | 0ab27c35a47901173f22d9e50ca75de0263c45a5 (diff) | |
| parent | 485c09a3765b900aea182ddd2dded2286fb0749a (diff) | |
| download | php-git-33db8c0ef6f46917349fbe07514a06f4f98bff85.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 84d603b591..5addec4ff2 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1818,11 +1818,12 @@ 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, (*tmp)->min_occurs > 0 TSRMLS_CC)) { - if ((*tmp)->min_occurs > 0) { + if (!model_to_xml_object(node, *tmp, object, style, strict && ((*tmp)->min_occurs > 0) TSRMLS_CC)) { + if (!strict || (*tmp)->min_occurs > 0) { return 0; } } + strict = 1; zend_hash_move_forward_ex(model->u.content, &pos); } return 1; @@ -1845,7 +1846,7 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval * return ret; } case XSD_CONTENT_GROUP: { - return model_to_xml_object(node, model->u.group->model, object, style, model->min_occurs > 0 TSRMLS_CC); + return model_to_xml_object(node, model->u.group->model, object, style, strict && model->min_occurs > 0 TSRMLS_CC); } default: break; |