diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-13 22:07:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-13 22:07:21 +0400 |
| commit | 4b900f483153b849167c4f45a81b5b882274a2a2 (patch) | |
| tree | 5124c1d3c359fb176dc471bb5688d14d4049de86 | |
| parent | 050aae2860e1c202e2e9db715beaa97d0a4c9c33 (diff) | |
| parent | 188c196d4da60bdde9190d2fc532650d17f7af2d (diff) | |
| download | php-git-4b900f483153b849167c4f45a81b5b882274a2a2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Proper bit reset code
| -rw-r--r-- | ext/soap/php_xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 866cbe3ebf..737a335e3a 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; |