diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-02-21 15:10:15 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-02-21 15:10:15 +0100 |
| commit | 1e9bc5677505585173ac105c997a09c095f34d1d (patch) | |
| tree | 199dfa0eb37ccc7512ab77a0d92c42da43b50ee2 | |
| parent | b5d267aa95aec1e89dc34f0bcc3c46576354cd26 (diff) | |
| parent | fcd4b5335a6df4e0676ee32e2267ca71d70fe623 (diff) | |
| download | php-git-1e9bc5677505585173ac105c997a09c095f34d1d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | ext/soap/php_xml.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index a74ec02f43..939385557d 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) { |