summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Schlossnagle <gschlossnagle@php.net>2005-10-07 05:14:31 +0000
committerGeorge Schlossnagle <gschlossnagle@php.net>2005-10-07 05:14:31 +0000
commit90de6c821694a3cbe09ceea85a31bf238db308ee (patch)
treed94dda47c292909dd4979a35962ee8dc5d39138e
parent6ca9ed38e4320d7f34a3144260cd1e50ebfbf172 (diff)
downloadphp-git-90de6c821694a3cbe09ceea85a31bf238db308ee.tar.gz
Permit correct usage of inherited encoders (from restriction/extension
"base" directives) for xml response decoding.
-rw-r--r--ext/soap/php_encoding.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index c15c51ae2e..2e28e41e42 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1189,6 +1189,7 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
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 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
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) {