cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug36908.phpt bug36908.wsdl

dmitry Mon Apr 10 13:29:49 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/soap/tests/bugs bug36908.phpt bug36908.wsdl Modified files: /php-src NEWS /php-src/ext/soap php_encoding.c Log: Fixed bug #36908 (wsdl default value overrides value in soap request). http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.502&r2=1.2027.2.503&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.502 php-src/NEWS:1.2027.2.503 --- php-src/NEWS:1.2027.2.502 Mon Apr 10 09:41:45 2006 +++ php-src/NEWS Mon Apr 10 13:29:48 2006 @@ -26,6 +26,8 @@ - Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus) - Fixed bug #36934 (OCILob->read() doesn't move internal pointer when reading 0's). (Tony) +- Fixed bug #36908 (wsdl default value overrides value in soap request). + (Dmitry) - Fixed bug #36898 (__set() leaks in classes extending internal ones). (Tony, Dmitry) - Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia) http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.19&r2=1.103.2.20&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.19 php-src/ext/soap/php_encoding.c:1.103.2.20 --- php-src/ext/soap/php_encoding.c:1.103.2.19 Sun Apr 9 23:35:51 2006 +++ php-src/ext/soap/php_encoding.c Mon Apr 10 13:29:48 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.19 2006/04/09 23:35:51 andrei Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.20 2006/04/10 13:29:48 dmitry Exp $ */ #include <time.h> @@ -1128,11 +1128,13 @@ { switch (model->kind) { case XSD_CONTENT_ELEMENT: - if (model->u.element->name) { - xmlNodePtr node = get_node(data->children, model->u.element->name); - if (node) { - zval *val; + if (model->u.element->name) { + xmlNodePtr node = get_node(data->children, model->u.element->name); + if (node) { + zval *val; + + node = check_and_resolve_href(node); if (node && node->children && node->children->content) { if (model->u.element->fixed && strcmp(model->u.element->fixed,node->children->content) != 0) { soap_error3(E_ERROR, "Encoding: Element '%s' has fixed value '%s' (value '%s' is not allowed)", model->u.element->name, model->u.element->fixed, node->children->content); http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.phpt?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug36908.phpt +++ php-src/ext/soap/tests/bugs/bug36908.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.wsdl?view=markup&rev=1.1 Index: php-src/ext/soap/tests/bugs/bug36908.wsdl +++ php-src/ext/soap/tests/bugs/bug36908.wsdl