Bug 1122642 - Have an error page for H2 INADEQUATE_SECURITY r=mcmanus,bz

This commit is contained in:
Nicholas Hurley
2016-04-14 19:24:46 -07:00
parent 599b21d541
commit ebc5ea79fd
13 changed files with 80 additions and 2 deletions

View File

@@ -5057,6 +5057,11 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
// ServiceWorker intercepted request, but something went wrong.
error.AssignLiteral("corruptedContentError");
break;
case NS_ERROR_NET_INADEQUATE_SECURITY:
// Server negotiated bad TLS for HTTP/2.
error.AssignLiteral("inadequateSecurityError");
addHostPort = true;
break;
default:
break;
}
@@ -7796,6 +7801,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
aStatus == NS_ERROR_UNSAFE_CONTENT_TYPE ||
aStatus == NS_ERROR_REMOTE_XUL ||
aStatus == NS_ERROR_INTERCEPTION_FAILED ||
aStatus == NS_ERROR_NET_INADEQUATE_SECURITY ||
NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) {
// Errors to be shown for any frame
DisplayLoadError(aStatus, url, nullptr, aChannel);