diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/soap/php_xml.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/soap/php_xml.c')
| -rw-r--r-- | ext/soap/php_xml.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 5ad5548c40..de79c07a30 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -77,7 +77,7 @@ static void soap_Comment(void *ctx, const xmlChar *value) { } -xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) +xmlDocPtr soap_xmlParseFile(const char *filename) { xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; @@ -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 TSRMLS_CC); + old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old TSRMLS_CC); + php_libxml_disable_entity_loader(old); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) { @@ -133,7 +133,6 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) xmlParserCtxtPtr ctxt = NULL; xmlDocPtr ret; - TSRMLS_FETCH(); /* xmlInitParser(); @@ -150,9 +149,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 TSRMLS_CC); + old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); - php_libxml_disable_entity_loader(old TSRMLS_CC); + php_libxml_disable_entity_loader(old); if (ctxt->wellFormed) { ret = ctxt->myDoc; if (ret->URL == NULL && ctxt->directory != NULL) { |