summaryrefslogtreecommitdiff
path: root/ext/xml/compat.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/xml/compat.c')
-rw-r--r--ext/xml/compat.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 43e116b864..7be85cab22 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -405,15 +405,12 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
efree(parser);
return NULL;
}
- if (encoding != NULL) {
- parser->parser->encoding = xmlStrdup(encoding);
#if LIBXML_VERSION <= 20617
/* for older versions of libxml2, allow correct detection of
* charset in documents with a BOM: */
- } else {
- parser->parser->charset = XML_CHAR_ENCODING_NONE;
+ parser->parser->charset = XML_CHAR_ENCODING_NONE;
#endif
- }
+
parser->parser->replaceEntities = 1;
parser->parser->wellFormed = 0;
if (sep != NULL) {