From c301c412b0148c030c7af40055caeb190816ba8d Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Wed, 26 Mar 2003 01:26:38 +0000 Subject: [PATCH] Checking in dbradley@netscape.com's fix for bug 198995. Make sure we default to the default charset if the server gives us one we don't know. r=jst@netscape.com, sr=peterv@netscape.com git-svn-id: svn://10.0.0.236/trunk@140314 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsScriptLoader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp index 606d46c93f8..6600910dc06 100644 --- a/mozilla/content/base/src/nsScriptLoader.cpp +++ b/mozilla/content/base/src/nsScriptLoader.cpp @@ -765,16 +765,17 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader, nsCOMPtr channel; channel = do_QueryInterface(req); + nsAutoString charset; if (channel) { nsCAutoString charsetVal; rv = channel->GetContentCharset(charsetVal); if (NS_SUCCEEDED(rv)) { - characterSet = NS_ConvertASCIItoUCS2(charsetVal); + charset = NS_ConvertASCIItoUCS2(charsetVal); nsCOMPtr calias(do_GetService(kCharsetAliasCID,&rv)); if(NS_SUCCEEDED(rv) && calias) { - rv = calias->GetPreferred(characterSet, preferred); + rv = calias->GetPreferred(charset, preferred); if(NS_SUCCEEDED(rv)) { characterSet = preferred; @@ -784,7 +785,6 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader, } if (NS_FAILED(rv) || characterSet.IsEmpty()) { - nsAutoString charset; // Check the charset attribute to determine script charset. request->mElement->GetCharset(charset); if (!charset.IsEmpty()) {