From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 16 Feb 2015 14:21:20 +0000 (-0200)
Subject: - Fix merge
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a80ad10d9b3e759c869a1d075fa89cb19ec740b5;p=php

- Fix merge
---

a80ad10d9b3e759c869a1d075fa89cb19ec740b5
diff --cc ext/soap/php_xml.c
index b32acdf41d,6eb92c63f8..35d2e4e8b0
--- a/ext/soap/php_xml.c
+++ b/ext/soap/php_xml.c
@@@ -100,9 -100,12 +100,12 @@@ xmlDocPtr soap_xmlParseFile(const char 
  		ctxt->sax->warning = NULL;
  		ctxt->sax->error = NULL;
  		/*ctxt->sax->fatalError = NULL;*/
+ #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) {