From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Fri, 16 May 2003 23:21:48 +0000 (+0000)
Subject: Allow libxml to detect the document encoding if encoding parameter passed to
X-Git-Tag: RELEASE_1_0_2~786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b67f2dc98dcf88d319bffdbd1bc07aa97b97beef;p=php

Allow libxml to detect the document encoding if encoding parameter passed to
XML_ParserCreate_MM is null.
---

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 3000f0d663..3a63a69088 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -276,7 +276,11 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 		parser->mem_hdlrs.free_fcn(parser->parser);
 		return NULL;
 	}
-	parser->parser->encoding = xmlStrdup(encoding);
+	if (encoding != NULL) {
+		parser->parser->encoding = xmlStrdup(encoding);
+	} else {
+		parser->parser->charset = XML_CHAR_ENCODING_NONE;
+	}
 	if (sep != NULL) {
 		parser->namespace = 1;
 		parser->_ns_map = xmlHashCreate(10);