Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp fix bug 4463 untill the nsParser SetDefaultCharset defined

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@26492 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com
1999-04-06 18:50:22 +00:00
parent 7ded6989f6
commit edca68ea3d
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/htmlparser/src/nsParser.cpp
View File

@@ -565,6 +565,15 @@ nsresult nsParser::Parse(nsIURL* aURL,nsIStreamObserver* aListener,PRBool aVerif
if (rv != NS_OK) return rv;
nsAutoString theName(spec);
// XXX temp hack to make parser use UTF-8 as default charset for XML, RDF, XUL
// XXX This should be removed once we have the SetDefaultCharset in the nsIParser interface
nsString last4;
theName.Right(last4, 4);
if(last4.EqualsIgnoreCase(".xul") || last4.EqualsIgnoreCase(".xml") || last4.EqualsIgnoreCase(".rdf") )
{
charset = "UTF-8";
}
// XXX begin of meta tag charset hack
if(theName.Equals(nsParser::gHackMetaCharsetURL) && (! nsParser::gHackMetaCharset.Equals("")))
@@ -675,11 +684,15 @@ nsresult nsParser::Parse(nsString& aSourceBuffer,void* aKey,const nsString& aCon
// charset =
// charsetSource = kCharsetFromUserDefault;
// XXXX get Doc Type Default (e.g. UTF-8 for XML)
// XXX We should really put if doc == html for the following line
charset = "ISO-8859-1";
charsetSource = kCharsetFromDocTypeDefault;
// XXX temp hack to make parser use UTF-8 as default charset for XML, RDF, XUL
// XXX This should be removed once we have the SetDefaultCharset in the nsIParser interface
if(aContentType.EqualsIgnoreCase("text/xul") || aContentType.EqualsIgnoreCase("text/xml") || aContentType.EqualsIgnoreCase("text/rdf") )
{
charset = "UTF-8";
} else {
charset = "ISO-8859-1";
}
charsetSource = kCharsetFromDocTypeDefault;
// XXX begin of meta tag charset hack
nsAutoString theFakeURL("fromString");

23
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@@ -565,6 +565,15 @@ nsresult nsParser::Parse(nsIURL* aURL,nsIStreamObserver* aListener,PRBool aVerif
if (rv != NS_OK) return rv;
nsAutoString theName(spec);
// XXX temp hack to make parser use UTF-8 as default charset for XML, RDF, XUL
// XXX This should be removed once we have the SetDefaultCharset in the nsIParser interface
nsString last4;
theName.Right(last4, 4);
if(last4.EqualsIgnoreCase(".xul") || last4.EqualsIgnoreCase(".xml") || last4.EqualsIgnoreCase(".rdf") )
{
charset = "UTF-8";
}
// XXX begin of meta tag charset hack
if(theName.Equals(nsParser::gHackMetaCharsetURL) && (! nsParser::gHackMetaCharset.Equals("")))
@@ -675,11 +684,15 @@ nsresult nsParser::Parse(nsString& aSourceBuffer,void* aKey,const nsString& aCon
// charset =
// charsetSource = kCharsetFromUserDefault;
// XXXX get Doc Type Default (e.g. UTF-8 for XML)
// XXX We should really put if doc == html for the following line
charset = "ISO-8859-1";
charsetSource = kCharsetFromDocTypeDefault;
// XXX temp hack to make parser use UTF-8 as default charset for XML, RDF, XUL
// XXX This should be removed once we have the SetDefaultCharset in the nsIParser interface
if(aContentType.EqualsIgnoreCase("text/xul") || aContentType.EqualsIgnoreCase("text/xml") || aContentType.EqualsIgnoreCase("text/rdf") )
{
charset = "UTF-8";
} else {
charset = "ISO-8859-1";
}
charsetSource = kCharsetFromDocTypeDefault;
// XXX begin of meta tag charset hack
nsAutoString theFakeURL("fromString");