diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-03-31 09:44:30 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:20:35 +0200 |
commit | 2407845ec187fc0bddcf061f41a5791c7041d9ff (patch) | |
tree | d367a246976a3f7e72842a4120b29d975d566b5d /netwerk | |
parent | 3f09b298b0d3b737e88115c869af8393a75bfd31 (diff) | |
download | UXP-2407845ec187fc0bddcf061f41a5791c7041d9ff.tar UXP-2407845ec187fc0bddcf061f41a5791c7041d9ff.tar.gz UXP-2407845ec187fc0bddcf061f41a5791c7041d9ff.tar.lz UXP-2407845ec187fc0bddcf061f41a5791c7041d9ff.tar.xz UXP-2407845ec187fc0bddcf061f41a5791c7041d9ff.zip |
Issue #1280 - Un-bust certerror pages and ForgetAboutSite
Diffstat (limited to 'netwerk')
-rw-r--r-- | netwerk/protocol/http/nsHttpChannel.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 05383916f..950b1a7ab 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -1530,7 +1530,7 @@ GetPKPConsoleErrorTag(uint32_t failureResult, nsAString& consoleErrorTag) } /** - * Process a single security header. Only two types are supported: HSTS and HPKP. + * Process a single security header. Only one type is supported: HSTS. */ nsresult nsHttpChannel::ProcessSingleSecurityHeader(uint32_t aType, @@ -1542,9 +1542,6 @@ nsHttpChannel::ProcessSingleSecurityHeader(uint32_t aType, case nsISiteSecurityService::HEADER_HSTS: atom = nsHttp::ResolveAtom("Strict-Transport-Security"); break; - case nsISiteSecurityService::HEADER_HPKP: - atom = nsHttp::ResolveAtom("Public-Key-Pins"); - break; default: NS_NOTREACHED("Invalid security header type"); return NS_ERROR_FAILURE; @@ -1568,10 +1565,6 @@ nsHttpChannel::ProcessSingleSecurityHeader(uint32_t aType, GetSTSConsoleErrorTag(failureResult, consoleErrorTag); consoleErrorCategory = NS_LITERAL_STRING("Invalid HSTS Headers"); break; - case nsISiteSecurityService::HEADER_HPKP: - GetPKPConsoleErrorTag(failureResult, consoleErrorTag); - consoleErrorCategory = NS_LITERAL_STRING("Invalid HPKP Headers"); - break; default: return NS_ERROR_FAILURE; } @@ -1641,10 +1634,6 @@ nsHttpChannel::ProcessSecurityHeaders() sslStatus, flags); NS_ENSURE_SUCCESS(rv, rv); - rv = ProcessSingleSecurityHeader(nsISiteSecurityService::HEADER_HPKP, - sslStatus, flags); - NS_ENSURE_SUCCESS(rv, rv); - return NS_OK; } |