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

fixes bug 56629 "Proxy: Client->Proxy connection errors should show proxy,

Browse Source 
not target hostname" r=bbaetz, sr=rpotts


git-svn-id: svn://10.0.0.236/trunk@134769 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2002-12-04 04:18:08 +00:00
parent f06acb5816
commit d23b0dfd5f
19 changed files with 337 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2567,6 +2567,14 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aUR
// Port blocked for security reasons
error.Assign(NS_LITERAL_STRING("deniedPortAccess"));
break;
case NS_ERROR_UNKNOWN_PROXY_HOST:
// Proxy hostname could not be resolved.
error.Assign(NS_LITERAL_STRING("proxyResolveFailure"));
break;
case NS_ERROR_PROXY_CONNECTION_REFUSED:
// Proxy connection was refused.
error.Assign(NS_LITERAL_STRING("proxyConnectFailure"));
break;
}
}

4
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -931,7 +931,9 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
// Errors to be shown only on top-level frames
if ((aStatus == NS_ERROR_UNKNOWN_HOST ||
aStatus == NS_ERROR_CONNECTION_REFUSED) &&
aStatus == NS_ERROR_CONNECTION_REFUSED ||
aStatus == NS_ERROR_UNKNOWN_PROXY_HOST ||
aStatus == NS_ERROR_PROXY_CONNECTION_REFUSED) &&
(isTopFrame || mUseErrorPages)) {
DisplayLoadError(aStatus, url, nsnull);
}