Fixed bug #40467 (Partial SOAP request sent when XSD sequence or choice include minOc...

diff --git a/NEWS b/NEWS
index 6dc370886cc42002ab7398c6c49a7e8c5a15327a..b6dd3106e834e5cc92ebb70c713b8ffb0ee1de41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
 - Upgraded PCRE to version 7.0 (Nuno)
 - Add --ri switch to CLI which allows to check extension information. (Marcus)
 - Added tidyNode::getParent() method (John, Nuno)
+- Fixed bug #40467 (Partial SOAP request sent when XSD sequence or choice
+  include minOccurs=0). (Dmitry) 
 - Fixed bug #40455 (proc_open() uses wrong commandline when safe_mode_exec_dir 
   is set). (Tony)
 - Fixed bug #40432 (strip_tags() fails with greater than in attribute). (Ilia)

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index aa2b98e887dc293a5aa5c0c8cb2c59dff569ec80..154a570a3538f04bda1b3e6967527dbbf1052824 100644 (file)
--- 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);
                        }