cvs: php-src /ext/soap php_encoding.c

gschlossnagle Fri Oct 7 01:14:31 2005 EDT Modified files: /php-src/ext/soap php_encoding.c Log: Permit correct usage of inherited encoders (from restriction/extension "base" directives) for xml response decoding. http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.108&r2=1.109&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.108 php-src/ext/soap/php_encoding.c:1.109 --- php-src/ext/soap/php_encoding.c:1.108 Thu Oct 6 18:30:08 2005 +++ php-src/ext/soap/php_encoding.c Fri Oct 7 01:14:31 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.108 2005/10/06 22:30:08 gschlossnagle Exp $ */ +/* $Id: php_encoding.c,v 1.109 2005/10/07 05:14:31 gschlossnagle Exp $ */ #include <time.h> @@ -1189,6 +1189,7 @@ enc = sdlType->encode; while (enc && enc->details.sdl_type && + enc->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX && enc->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE && enc->details.sdl_type->kind != XSD_TYPEKIND_LIST && enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) { @@ -1211,6 +1212,7 @@ sdlType->encode && type != &sdlType->encode->details) { if (sdlType->encode->details.sdl_type && + sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) {