com php-src: Proper bit reset code (cherry picked from commit 188c196d4da60bdde9190d2fc532650d17f7af2d): ext/soap/php_xml .c
| From: | Johannes Schlüter | Date: | Wed, 13 Feb 2013 20:51:22 +0000 |
| Subject: | com php-src: Proper bit reset code (cherry picked from commit 188c196d4da60bdde9190d2fc532650d17f7af2d): ext/soap/php_xml .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71228@lists.php.net to get a copy of this message | ||
Commit: 588d7adcb2660ab6a4e1736b88c45b7e073aa74d
Author: Dmitry Stogov <dmitry@zend.com> Wed, 13 Feb 2013 22:06:37 +0400
Committer: Johannes Schlüter <johannes@php.net> Wed, 13 Feb 2013 21:51:22 +0100
Parents: 8710d330dadf614d9ebb7e5d4dc62b4ce9c9eeda
Branches: PHP-5.3.22
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=588d7adcb2660ab6a4e1736b88c45b7e073aa74d
Log:
Proper bit reset code
(cherry picked from commit 188c196d4da60bdde9190d2fc532650d17f7af2d)
Changed paths:
M ext/soap/php_xml.c
Diff:
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c
index a69d071..006db85 100644
--- a/ext/soap/php_xml.c
+++ b/ext/soap/php_xml.c
@@ -92,7 +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->options &= ~XML_PARSE_DTDLOAD;
ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
ctxt->sax->comment = soap_Comment;
ctxt->sax->warning = NULL;
@@ -134,7 +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->options &= ~XML_PARSE_DTDLOAD;
ctxt->sax->ignorableWhitespace = soap_ignorableWhitespace;
ctxt->sax->comment = soap_Comment;
ctxt->sax->warning = NULL;