Merge branch 'redwood' into 28.9-platform

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;
 }