Backed out 3 changesets (bug 1325876) for causing multiple failures. CLOSED TREE
Backed out changeset 4b1363236bcd (bug 1325876) Backed out changeset b3c3a5d3c6b9 (bug 1325876) Backed out changeset b5a8d01c0651 (bug 1325876)
This commit is contained in:
@@ -3353,9 +3353,6 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
|
||||
nestedURI = do_QueryInterface(tempURI);
|
||||
}
|
||||
error = "unknownProtocolFound";
|
||||
} else if (NS_ERROR_NET_EMPTY_RESPONSE == aError) {
|
||||
NS_ENSURE_ARG_POINTER(aURI);
|
||||
error = "httpErrorPage";
|
||||
} else if (NS_ERROR_NET_ERROR_RESPONSE == aError) {
|
||||
NS_ENSURE_ARG_POINTER(aURI);
|
||||
error = "serverError";
|
||||
@@ -6105,7 +6102,6 @@ nsresult nsDocShell::FilterStatusForErrorPage(
|
||||
|
||||
if (aStatus == NS_ERROR_NET_TIMEOUT ||
|
||||
aStatus == NS_ERROR_NET_TIMEOUT_EXTERNAL ||
|
||||
aStatus == NS_ERROR_NET_EMPTY_RESPONSE ||
|
||||
aStatus == NS_ERROR_NET_ERROR_RESPONSE ||
|
||||
aStatus == NS_ERROR_PROXY_GATEWAY_TIMEOUT ||
|
||||
aStatus == NS_ERROR_REDIRECT_LOOP ||
|
||||
|
||||
Reference in New Issue
Block a user