diff options
author | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:47:30 -0200 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:47:30 -0200 |
commit | d259a853f4082df93ccbb019b70cfcf55b9b7ede (patch) | |
tree | 769d5f9ed30104814dcc2022c78397bf198e26fa | |
parent | c4664d173160c967a31234e7ba79516ba847ef1e (diff) | |
parent | 83f85a4ab3a94178d9167d3bfff1ac3546894bec (diff) | |
download | php-git-d259a853f4082df93ccbb019b70cfcf55b9b7ede.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
BFN
Update NEWS
-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); |