diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-07 16:09:49 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-07 16:09:49 +0400 |
| commit | 0547a36e95ec36025a30e93e971d26b6b1ecf0e9 (patch) | |
| tree | 8770b0319530b367666c571b890bf85f2e5e84c6 /ext | |
| parent | 4730bc86801e593b8e910e3dce30e32cd758adee (diff) | |
| parent | 1a18e84822cf7d9196961052e38cde9404de86e7 (diff) | |
| download | php-git-0547a36e95ec36025a30e93e971d26b6b1ecf0e9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Disabled external entities loading
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/soap/php_xml.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index cf7fead6b3..866cbe3ebf 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -92,6 +92,7 @@ xmlDocPtr soap_xmlParseFile(const char *filename TSRMLS_DC) PG(allow_url_fopen) = old_allow_url_fopen; if (ctxt) { ctxt->keepBlanks = 0; + ctxt->options -= XML_PARSE_DTDLOAD; ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace; ctxt->sax->comment = soap_Comment; ctxt->sax->warning = NULL; @@ -133,6 +134,7 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) */ ctxt = xmlCreateMemoryParserCtxt(buf, buf_size); if (ctxt) { + ctxt->options -= XML_PARSE_DTDLOAD; ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace; ctxt->sax->comment = soap_Comment; ctxt->sax->warning = NULL; |