diff options
| author | Felipe Pena <felipensp@gmail.com> | 2015-02-16 13:09:52 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2015-02-16 13:09:52 -0200 |
| commit | abbc82f4481f236521b0426d0956f6037dd3cbf4 (patch) | |
| tree | 769d5f9ed30104814dcc2022c78397bf198e26fa | |
| parent | c4664d173160c967a31234e7ba79516ba847ef1e (diff) | |
| parent | 35a68c276dd7c12e52751cb66300e85355472e8d (diff) | |
| download | php-git-abbc82f4481f236521b0426d0956f6037dd3cbf4.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fix merge
BFN
| -rw-r--r-- | ext/soap/php_xml.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 8a61efb2d2..6eb92c63f8 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -100,6 +100,9 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) 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); xmlParseDocument(ctxt); php_libxml_disable_entity_loader(old TSRMLS_CC); |