diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-16 23:21:48 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-16 23:21:48 +0000 |
| commit | b67f2dc98dcf88d319bffdbd1bc07aa97b97beef (patch) | |
| tree | ac4e49a4612e219f5f907a5685b723eeae55b109 | |
| parent | f3b050fba15cd7f602faf02ee9443f2eb7680748 (diff) | |
| download | php-git-b67f2dc98dcf88d319bffdbd1bc07aa97b97beef.tar.gz | |
Allow libxml to detect the document encoding if encoding parameter passed to
XML_ParserCreate_MM is null.
| -rw-r--r-- | ext/xml/compat.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |