- Fix merge

diff --cc ext/soap/php_xml.c
index b32acdf41d32efca050106ce991ef403a67d0385,6eb92c63f83a513ac3b326510fc792e8ed93bdc7..35d2e4e8b0d11391b0210d8dd56b9c00f96f9977
--- 1/ext/soap/php_xml.c
--- 2/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;*/
 -              old = php_libxml_disable_entity_loader(1 TSRMLS_CC);
+ #if LIBXML_VERSION >= 20703
+               ctxt->options |= XML_PARSE_HUGE;
+ #endif
 +              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) {

diff --cc sapi/fpm/fpm/fpm_request.c
Simple merge