lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

don't override existing encoding specified before starting

Browse Source 
* parser.c: don't override existing encoding specified before
  starting xmlParseDocument()
Daniel
This commit is contained in:
Daniel Veillard
2001-07-28 17:21:12 +00:00
parent fdb1f24420
commit 4aafa79013
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jul 29 07:18:53 EDT 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* parser.c: don't override existing encoding specified before
starting xmlParseDocument()
Sat Jul 28 13:33:10 EDT 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Sat Jul 28 13:33:10 EDT 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* include/libxml/xmlwin32version.h: reinserted, needed for * include/libxml/xmlwin32version.h: reinserted, needed for

26
parser.c
View File

@ -7297,18 +7297,20 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) if ((ctxt->sax) && (ctxt->sax->setDocumentLocator))
ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator); ctxt->sax->setDocumentLocator(ctxt->userData, &xmlDefaultSAXLocator);
/* if (ctxt->encoding == XML_CHAR_ENCODING_NONE) {
* Get the 4 first bytes and decode the charset /*
* if enc != XML_CHAR_ENCODING_NONE * Get the 4 first bytes and decode the charset
* plug some encoding conversion routines. * if enc != XML_CHAR_ENCODING_NONE
*/ * plug some encoding conversion routines.
start[0] = RAW; */
start[1] = NXT(1); start[0] = RAW;
start[2] = NXT(2); start[1] = NXT(1);
start[3] = NXT(3); start[2] = NXT(2);
enc = xmlDetectCharEncoding(start, 4); start[3] = NXT(3);
if (enc != XML_CHAR_ENCODING_NONE) { enc = xmlDetectCharEncoding(start, 4);
xmlSwitchEncoding(ctxt, enc); if (enc != XML_CHAR_ENCODING_NONE) {
xmlSwitchEncoding(ctxt, enc);
}
} }