From: Johannes Schlüter <johannes@php.net> Date: Thu, 21 Feb 2013 14:08:58 +0000 (+0100) Subject: Fix TSRM (after afc1debb) X-Git-Tag: php-5.4.13RC1~2^2~2 X-Git-Url: http://git.php.net/?p=php-src.git;a=commitdiff_plain;h=fcd4b5335a6df4e0676ee32e2267ca71d70fe623;hp=7b113d789df26b2ad560e747cac0b1ed2043adec Fix TSRM (after afc1debb) --- diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 7823100..2f2c5c9 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -100,9 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ - old = php_libxml_disable_entity_loader(1); + old = php_libxml_disable_entity_loader(1 TSRMLS_CC); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old); + php_libxml_disable_entity_loader(old TSRMLS_CC); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) { @@ -133,6 +133,8 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; + TSRMLS_FETCH(); + /* xmlInitParser(); */ @@ -148,9 +150,9 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) #if LIBXML_VERSION >= 20703 ctxt->options |= XML_PARSE_HUGE; #endif - old = php_libxml_disable_entity_loader(1); + old = php_libxml_disable_entity_loader(1 TSRMLS_CC); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old); + php_libxml_disable_entity_loader(old TSRMLS_CC); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) {