summaryrefslogtreecommitdiff
path: root/ext/soap/php_schema.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2004-01-09 14:16:30 +0000
committerDmitry Stogov <dmitry@php.net>2004-01-09 14:16:30 +0000
commit792b0e8f0b1a5ac0f8eb51ad43db364fbae1c6a6 (patch)
tree2da0a9be1d511a52a04bf1ed395b45b05bd8732c /ext/soap/php_schema.c
parentcf7afb8f180b36eb675d28e3e760c5c711c98468 (diff)
downloadphp-git-792b0e8f0b1a5ac0f8eb51ad43db364fbae1c6a6.tar.gz
SOAP Encoding/Decoding were improved.
Diffstat (limited to 'ext/soap/php_schema.c')
-rw-r--r--ext/soap/php_schema.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index ce0c9b1a1a..647accc19b 100644
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -716,7 +716,7 @@ static int schema_complexContent(sdlPtr *sdl, xmlAttrPtr tsn, xmlNodePtr compCon
}
content = get_node(compCont->children, "extension");
- if(content == NULL) {
+ if(content != NULL) {
// php_error(E_ERROR, "Error parsing schema (doesn't support extensions on complexContent)");
schema_extension_complexContent(sdl, tsn, content, cur_type);
return TRUE;
@@ -778,6 +778,9 @@ static int schema_complexType(sdlPtr *sdl, xmlAttrPtr tsn, xmlNodePtr compType,
cur_type = (*ptr);
create_encoder((*sdl), cur_type, ns->children->content, name->children->content);
smart_str_free(&key);
+ if (cur_type->encode == NULL) {
+ cur_type->encode = get_conversion(SOAP_ENC_OBJECT);
+ }
}
content = get_node(compType->children, "simpleContent");
@@ -816,9 +819,6 @@ static int schema_complexType(sdlPtr *sdl, xmlAttrPtr tsn, xmlNodePtr compType,
schema_sequence(sdl, tsn, content, cur_type);
}
-// if (cur_type->encode == NULL) {
-// cur_type->encode = get_conversion(SOAP_ENC_OBJECT);
-// }
return TRUE;
}
/*