From: George Schlossnagle <gschlossnagle@php.net>
Date: Fri, 7 Oct 2005 05:14:52 +0000 (+0000)
Subject: Permit correct usage of inherited encoders (from restriction/extension
X-Git-Tag: php-5.1.0RC2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa3394eccbd0306c2204a62928ad075c122b0744;p=php

Permit correct usage of inherited encoders (from restriction/extension
"base" directives) for xml response decoding.
---

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 90e614f7b7..17a864d0f8 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1185,9 +1185,9 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 		if (sdlType->kind == XSD_TYPEKIND_RESTRICTION &&
 		    sdlType->encode && type != &sdlType->encode->details) {
 			encodePtr enc;
-
 			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) {
@@ -1210,6 +1210,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) {