Fixed ZTS build

diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index 10119a45de3507a54f860ba5c82bb5a70081be3f..1e735bf91eaaf09057c6de735ce5857ffaf38475 100644 (file)
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -95,14 +95,14 @@ static encodePtr get_create_encoder(sdlPtr sdl, sdlTypePtr cur_type, const char
        return enc;
 }
 
-static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import) {
+static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import TSRMLS_DC) {
        if (location != NULL &&
            !zend_hash_exists(&ctx->docs, location, strlen(location)+1)) {
                xmlDocPtr doc;
                xmlNodePtr schema;
                xmlAttrPtr new_tns;
 
-               doc = soap_xmlParseFile(location);
+               doc = soap_xmlParseFile(location TSRMLS_CC);
                if (doc == NULL) {
                        soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
                }
@@ -133,7 +133,7 @@ static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlA
                        }
                }
                zend_hash_add(&ctx->docs, location, strlen(location)+1, (void**)&doc, sizeof(xmlDocPtr), NULL);
-               load_schema(ctx, schema);
+               load_schema(ctx, schema TSRMLS_CC);
        }
 }
 
@@ -157,7 +157,7 @@ static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlA
   Content: ((include | import | redefine | annotation)*, (((simpleType | complexType | group | attributeGroup) | element | attribute | notation), annotation*)*)
 </schema>
 */
-int load_schema(sdlCtx *ctx,xmlNodePtr schema)
+int load_schema(sdlCtx *ctx, xmlNodePtr schema TSRMLS_DC)
 {
        xmlNodePtr trav;
        xmlAttrPtr tns;
@@ -199,7 +199,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
                        uri = xmlBuildURI(location->children->content, base);
                            xmlFree(base);
                                }
-                               schema_load_file(ctx,NULL,uri,tns,0);
+                               schema_load_file(ctx, NULL, uri, tns, 0 TSRMLS_CC);
                                xmlFree(uri);
                        }
 
@@ -219,7 +219,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
                        uri = xmlBuildURI(location->children->content, base);
                            xmlFree(base);
                                }
-                               schema_load_file(ctx,NULL,uri,tns,0);
+                               schema_load_file(ctx, NULL, uri, tns, 0 TSRMLS_CC);
                                xmlFree(uri);
                                /* TODO: <redefine> support */
                        }
@@ -244,7 +244,7 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
                            xmlFree(base);
                                }
                        }
-                       schema_load_file(ctx,ns,uri,tns,1);
+                       schema_load_file(ctx, ns, uri, tns, 1 TSRMLS_CC);
                        if (uri != NULL) {xmlFree(uri);}
                } else if (node_is_equal(trav,"annotation")) {
                        /* TODO: <annotation> support */

diff --git a/ext/soap/php_schema.h b/ext/soap/php_schema.h
index 9101725df3013b682364cd63a1f6bc66f6f939ef..25d098ad1c61f460ecc0e80c12926e148ab1d8dd 100644 (file)
--- a/ext/soap/php_schema.h
+++ b/ext/soap/php_schema.h
@@ -22,7 +22,7 @@
 #ifndef PHP_SCHEMA_H
 #define PHP_SCHEMA_H
 
-int load_schema(sdlCtx *ctx, xmlNodePtr schema);
+int load_schema(sdlCtx *ctx, xmlNodePtr schema TSRMLS_DC);
 void schema_pass2(sdlCtx *ctx);
 
 void delete_model(void *handle);

diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 4699a585e6f2737fdb6b02ccff8ba01febc3d6f6..2a45a430ea6fe9f078ffe4325131cf6b5821007b 100644 (file)
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -211,7 +211,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
                return;
        }
        
-       wsdl = soap_xmlParseFile(struri);
+       wsdl = soap_xmlParseFile(struri TSRMLS_CC);
        
        if (!wsdl) {
                soap_error1(E_ERROR, "Parsing WSDL: Couldn't load from '%s'", struri);
@@ -225,7 +225,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
                if (include) {
                        xmlNodePtr schema = get_node_ex(root, "schema", XSD_NAMESPACE);
                        if (schema) {
-                               load_schema(ctx, schema);
+                               load_schema(ctx, schema TSRMLS_CC);
                                return;
                        }
                }
@@ -251,7 +251,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include
 
                        while (trav2 != NULL) {
                                if (node_is_equal_ex(trav2, "schema", XSD_NAMESPACE)) {
-                                       load_schema(ctx, trav2);
+                                       load_schema(ctx, trav2 TSRMLS_CC);
                                } else if (is_wsdl_element(trav2) && !node_is_equal(trav2,"documentation")) {
                                        soap_error1(E_ERROR, "Parsing WSDL: Unexpected WSDL element <%s>", trav2->name);
                                }

diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c
index 73035ee56c9a3e3bda1c08ec121e5540c7927c34..c6992fc05a103d971d2a3d12e7aadece4cc831d4 100644 (file)
--- a/ext/soap/php_xml.c
+++ b/ext/soap/php_xml.c
@@ -76,7 +76,7 @@ static void soap_Comment(void *ctx, const xmlChar *value)
 {
 }
 
-xmlDocPtr soap_xmlParseFile(const char *filename)
+xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC)
 {
        xmlParserCtxtPtr ctxt = NULL;
        xmlDocPtr ret;

diff --git a/ext/soap/php_xml.h b/ext/soap/php_xml.h
index dfb31ffad24a9d9684a9ba6c17074cf6144657ea..8150e2a56aef962af3df05b354047fd857b5075f 100644 (file)
--- a/ext/soap/php_xml.h
+++ b/ext/soap/php_xml.h
@@ -30,7 +30,7 @@
 #define node_is_equal(node, name) node_is_equal_ex(node, name, NULL)
 #define attr_is_equal(node, name) attr_is_equal_ex(node, name, NULL)
 
-xmlDocPtr soap_xmlParseFile(const char *filename);
+xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC);
 xmlDocPtr soap_xmlParseMemory(const void *buf, size_t size);
 
 xmlNsPtr attr_find_ns(xmlAttrPtr node);