diff options
| author | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:08:26 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2015-02-16 12:08:26 -0200 |
| commit | 76a505f09b0087753d2430dd728e42b5ccd92ac9 (patch) | |
| tree | 95944986775a00079901f391d72296d24125d38d | |
| parent | dbf7d525a5226adee586333ea9ffb1d61f8b5489 (diff) | |
| parent | 40c60b8212b8ab18fd5bf9a426f99e42d9908f8e (diff) | |
| download | php-git-76a505f09b0087753d2430dd728e42b5ccd92ac9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
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); |