diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-13 22:07:57 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-13 22:07:57 +0400 |
| commit | 1bde2b4fc9859866af6a53c3fd062b561b9d742c (patch) | |
| tree | d3f8417a226bb97e1b173f9e4518a1e02079d1c1 /ext/soap/php_xml.c | |
| parent | 65fa9f2c4b0dcb8a748085079cfed035bcef7b5b (diff) | |
| parent | 4b900f483153b849167c4f45a81b5b882274a2a2 (diff) | |
| download | php-git-1bde2b4fc9859866af6a53c3fd062b561b9d742c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Proper bit reset code
Diffstat (limited to 'ext/soap/php_xml.c')
| -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; |