[PHP-CVS] com php-src: Disabled external entities loading: ext/soap/php_xml.c

2013-02-12 Thread Stanislav Malyshev 
Commit:f2b5b9d69e3eab6fabf208ce7e3b1de5d3809c6f
Author:Dmitry Stogov  Thu, 7 Feb 2013 16:07:05 
+0400
Committer: Stanislav Malyshev   Sun, 10 Feb 2013 01:05:36 
-0800
Parents:   c5b33c754c5c4aea219c74a316db0a872ac5f70d
Branches:  PHP-5.4.12

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f2b5b9d69e3eab6fabf208ce7e3b1de5d3809c6f

Log:
Disabled external entities loading

Changed paths:
  M  ext/soap/php_xml.c


Diff:
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c
index cf7fead..866cbe3 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;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Disabled external entities loading: ext/soap/php_xml.c

2013-02-07 Thread Dmitry Stogov 
Commit:afe98b7829d50806559acac9b530acb8283c3bf4
Author:Dmitry Stogov  Thu, 7 Feb 2013 16:07:05 
+0400
Parents:   cc4c318b0c71e1a9c9cf803b5ee5d437344d64db
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=afe98b7829d50806559acac9b530acb8283c3bf4

Log:
Disabled external entities loading

Changed paths:
  M  ext/soap/php_xml.c


Diff:
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c
index 65abed1..a69d071 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;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php