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

Changed DisplayLoadError() to assume UTF-8 domain name,

Browse Source 
also changed to unescape and convert the spec using originCharset.
bug 122705, r=shanjian, sr=darin.


git-svn-id: svn://10.0.0.236/trunk@131433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nhotta%netscape.com
2002-10-08 18:02:40 +00:00
parent 66faa22cbd
commit 5bac7023c4
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -2482,7 +2482,17 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aUR
NS_ENSURE_ARG_POINTER(aURI);
nsCAutoString spec;
aURI->GetPath(spec);
formatStrs[0].AssignWithConversion(spec.get());
nsCAutoString charset;
// unescape and convert from origin charset
aURI->GetOriginCharset(charset);
nsCOMPtr<nsITextToSubURI> textToSubURI(
do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv))
rv = textToSubURI->UnEscapeURIForUI(charset, spec, formatStrs[0]);
if (NS_FAILED(rv)) {
CopyASCIItoUCS2(spec, formatStrs[0]);
rv = NS_OK;
}
formatStrCount = 1;
error.Assign(NS_LITERAL_STRING("fileNotFound"));
}
@@ -2491,7 +2501,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aUR
// Get the host
nsCAutoString host;
aURI->GetHost(host);
formatStrs[0].AssignWithConversion(host.get());
formatStrs[0].Assign(NS_ConvertUTF8toUCS2(host));
formatStrCount = 1;
error.Assign(NS_LITERAL_STRING("dnsNotFound"));
}
@@ -2509,7 +2519,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aUR
// Get the host
nsCAutoString host;
aURI->GetHost(host);
formatStrs[0].AssignWithConversion(host.get());
formatStrs[0].Assign(NS_ConvertUTF8toUCS2(host));
formatStrCount = 1;
error.Assign(NS_LITERAL_STRING("netTimeout"));
}