Index: compat.c =================================================================== RCS file: /repository/php-src/ext/xml/compat.c,v retrieving revision 1.44.2.2 diff -u -r1.44.2.2 compat.c --- compat.c 12 Oct 2005 13:58:10 -0000 1.44.2.2 +++ compat.c 28 Nov 2005 19:22:00 -0000 @@ -405,15 +405,11 @@ 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) {