Advertise HTTP/2 support.

net/http/http_server_properties.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_server_properties.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_config.h"
 
 namespace net {
 
 const char kAlternateProtocolHeader[] = "Alternate-Protocol";
 
 namespace {
 
 // The order of these strings much match the order of the enum definition
 // for AlternateProtocol.
 const char* const kAlternateProtocolStrings[] = {
-  "npn-spdy/2",
-  "npn-spdy/3",
-  "npn-spdy/3.1",
-  "npn-h2-14",  // HTTP/2 draft-14. Called SPDY4 internally.
-  "npn-h2-15",  // HTTP/2 draft-15. Called SPDY4 internally.
-  "quic"
-};
+    "npn-spdy/2",
+    "npn-spdy/3",
+    "npn-spdy/3.1",
+    "npn-h2-14",  // HTTP/2 draft-14. Called SPDY4 internally.
+    "npn-h2-15",  // HTTP/2 draft-15. Called SPDY4 internally.
+    "npn-h2",
+    "quic"};
 
 static_assert(arraysize(kAlternateProtocolStrings) ==
                   NUM_VALID_ALTERNATE_PROTOCOLS,
               "kAlternateProtocolStrings has incorrect size");
 
 }  // namespace
 
 void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
   UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
                             ALTERNATE_PROTOCOL_USAGE_MAX);
@@ skipping 10 matching lines @@
       protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
 }
 
 const char* AlternateProtocolToString(AlternateProtocol protocol) {
   switch (protocol) {
     case DEPRECATED_NPN_SPDY_2:
     case NPN_SPDY_3:
     case NPN_SPDY_3_1:
     case NPN_SPDY_4_14:
     case NPN_SPDY_4_15:
+    case NPN_SPDY_4:
     case QUIC:
       DCHECK(IsAlternateProtocolValid(protocol));
       return kAlternateProtocolStrings[
           protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
     case UNINITIALIZED_ALTERNATE_PROTOCOL:
       return "Uninitialized";
   }
   NOTREACHED();
   return "";
 }
@@ skipping 13 matching lines @@
     case kProtoDeprecatedSPDY2:
       return DEPRECATED_NPN_SPDY_2;
     case kProtoSPDY3:
       return NPN_SPDY_3;
     case kProtoSPDY31:
       return NPN_SPDY_3_1;
     case kProtoSPDY4_14:
       return NPN_SPDY_4_14;
     case kProtoSPDY4_15:
       return NPN_SPDY_4_15;
+    case kProtoSPDY4:
+      return NPN_SPDY_4;
     case kProtoQUIC1SPDY3:
       return QUIC;
 
     case kProtoUnknown:
     case kProtoHTTP11:
       break;
   }
 
   NOTREACHED() << "Invalid NextProto: " << next_proto;
   return UNINITIALIZED_ALTERNATE_PROTOCOL;
 }
 
 std::string AlternateProtocolInfo::ToString() const {
   return base::StringPrintf("%d:%s p=%f%s", port,
                             AlternateProtocolToString(protocol),
                             probability,
                             is_broken ? " (broken)" : "");
 }
 
 // static
 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
   ssl_config->next_protos.clear();
   ssl_config->next_protos.push_back(kProtoHTTP11);
 }
 
 }  // namespace net