diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-09 16:05:55 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-09 16:06:56 +0200 |
| commit | ebecf569f98b83bcd0fab20418a5983e6f14d39e (patch) | |
| tree | 7a5f7a87f848fab2cd4dc826a90b314374fe6a32 /ext/xml/xml.c | |
| parent | efa5674a9b26864d35618360c2fc99f0b3374a64 (diff) | |
| parent | 2845f859c19965691855c66bc18d94a4e06ff329 (diff) | |
| download | php-git-ebecf569f98b83bcd0fab20418a5983e6f14d39e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #30875: xml_parse_into_struct() does not resolve entities
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 7f1bb30571..9b8281e1b3 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1437,7 +1437,6 @@ PHP_FUNCTION(xml_parse_into_struct) parser->level = 0; parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0); - XML_SetDefaultHandler(parser->parser, _xml_defaultHandler); XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler); XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); |