summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Lytochkin <lytboris@php.net>2013-02-07 21:43:37 +0400
committerBoris Lytochkin <lytboris@php.net>2013-02-07 21:43:37 +0400
commit92a7924c1a97563cb73d37c369fdea4794203397 (patch)
tree250bee0257537640502b3ff3b0a9bc7d90115066
parented6763420c10c5eb47d6db675322ecaa6de079b6 (diff)
parent1a18e84822cf7d9196961052e38cde9404de86e7 (diff)
downloadphp-git-92a7924c1a97563cb73d37c369fdea4794203397.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
-rw-r--r--ext/soap/php_xml.c2
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;