cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c

From: Date: Thu, 15 Feb 2007 14:48:13 +0000
Subject: cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-43073@lists.php.net to get a copy of this message
dmitry Thu Feb 15 14:48:13 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /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/NEWS?r1=1.2027.2.547.2.541&r2=1.2027.2.547.2.542&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.541 php-src/NEWS:1.2027.2.547.2.542 --- php-src/NEWS:1.2027.2.547.2.541 Thu Feb 15 12:33:16 2007 +++ php-src/NEWS Thu Feb 15 14:48:12 2007 @@ -5,6 +5,8 @@ - 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) http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.21&r2=1.103.2.21.2.22&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.21 php-src/ext/soap/php_encoding.c:1.103.2.21.2.22 --- php-src/ext/soap/php_encoding.c:1.103.2.21.2.21 Fri Jan 5 15:06:55 2007 +++ php-src/ext/soap/php_encoding.c Thu Feb 15 14:48:12 2007 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.21.2.21 2007/01/05 15:06:55 iliaa Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21.2.22 2007/02/15 14:48:12 dmitry Exp $ */ #include <time.h> @@ -1574,8 +1574,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); }

« previous php.cvs (#43073) next »