diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-07 16:09:12 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-07 16:09:12 +0400 |
| commit | 1a18e84822cf7d9196961052e38cde9404de86e7 (patch) | |
| tree | ada8751962dda22d832bceefe482f6c4f40ef7e8 | |
| parent | 702b436ef470cc02f8e2cc21f2fadeee42103c74 (diff) | |
| parent | afe98b7829d50806559acac9b530acb8283c3bf4 (diff) | |
| download | php-git-1a18e84822cf7d9196961052e38cde9404de86e7.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Disabled external entities loading
| -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; |