WSDL support: use of type before declaration (see interop round2 base OpenLink echoSt...

diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index 4659039d27b1acb59d3a019d123a827daf0ef45b..1b0756e4d8bb8102296b389774f428b2881434ad 100644 (file)
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -358,8 +358,9 @@ static int schema_restriction_simpleContent(sdlPtr *sdl, xmlAttrPtr tsn, xmlNode
        xmlAttrPtr base;
 
        base = get_attribute(restType->properties, "base");
-       if (base != NULL)
+       if (base != NULL) {
                cur_type->encode = get_encoder_from_prefix((*sdl), restType, base->children->content);
+       }
 
        content = get_node(restType->children, "simpleType");
        if (content != NULL) {

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index d7ac2d85626688b667c2ebc0c3d625fb8ae18813..cb927224e951f07e2a592c3cf28f4ae77be55df4 100644 (file)
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -91,7 +91,7 @@ encodePtr create_encoder(sdlPtr sdl, sdlTypePtr cur_type, const char *ns, const
                sdl->encoders = malloc(sizeof(HashTable));
                zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, 1);
        }
-       zend_hash_add(sdl->encoders, nscat.c, nscat.len + 1, &enc, sizeof(encodePtr), NULL);
+       zend_hash_update(sdl->encoders, nscat.c, nscat.len + 1, &enc, sizeof(encodePtr), NULL);
        smart_str_free(&nscat);
        return enc;
 }