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

dmitry Sun Oct 9 08:41:45 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS /php-src/ext/soap php_encoding.c Log: Fixed bug #34788 (SOAP Client not applying correct namespace to generated values) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.102&r2=1.2027.2.103&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.102 php-src/NEWS:1.2027.2.103 --- php-src/NEWS:1.2027.2.102 Sun Oct 9 07:05:44 2005 +++ php-src/NEWS Sun Oct 9 08:41:44 2005 @@ -43,6 +43,8 @@ - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems. (Andrey) +- Fixed bug #34788 (SOAP Client not applying correct namespace to generated + values). (Dmitry) - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry) - Fixed bug #34785 (subclassing of mysqli_stmt does not work). (Georg) - Fixed bug #34771 (strtotime() fails with 1-12am/pm). (Derick) http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.7&r2=1.103.2.8&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.7 php-src/ext/soap/php_encoding.c:1.103.2.8 --- php-src/ext/soap/php_encoding.c:1.103.2.7 Sun Oct 9 07:05:46 2005 +++ php-src/ext/soap/php_encoding.c Sun Oct 9 08:41:44 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.7 2005/10/09 11:05:46 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.8 2005/10/09 12:41:44 dmitry Exp $ */ #include <time.h> @@ -1380,7 +1380,7 @@ } } return 1; - } else if (strict && model->u.element->nillable) { + } else if (strict && model->u.element->nillable && model->min_occurs > 0) { property = xmlNewNode(NULL,model->u.element->name); xmlAddChild(node, property); if (style == SOAP_ENCODED) { @@ -1389,6 +1389,12 @@ xmlNsPtr xsi = encode_add_ns(property,XSI_NAMESPACE); xmlSetNsProp(property, xsi, "nil", "true"); } + if (style == SOAP_LITERAL && + model->u.element->namens && + model->u.element->form == XSD_FORM_QUALIFIED) { + xmlNsPtr nsp = encode_add_ns(property, model->u.element->namens); + xmlSetNs(property, nsp); + } return 1; } else if (model->min_occurs == 0) { return 2;