Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: net/http/http_server_properties.cc

Issue 265823019: Update HTTP/2 NPN/ALPN tokens to "h2-12" to advertise draft 12 support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_response_info.cc ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_server_properties.h" 5 #include "net/http/http_server_properties.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 10
11 namespace net { 11 namespace net {
12 12
13 const char kAlternateProtocolHeader[] = "Alternate-Protocol"; 13 const char kAlternateProtocolHeader[] = "Alternate-Protocol";
14 14
15 namespace { 15 namespace {
16 16
17 // The order of these strings much match the order of the enum definition 17 // The order of these strings much match the order of the enum definition
18 // for AlternateProtocol. 18 // for AlternateProtocol.
19 const char* const kAlternateProtocolStrings[] = { 19 const char* const kAlternateProtocolStrings[] = {
20 "npn-spdy/2", 20 "npn-spdy/2",
21 "npn-spdy/3", 21 "npn-spdy/3",
22 "npn-spdy/3.1", 22 "npn-spdy/3.1",
23 "npn-h2-11", // HTTP/2 draft 11. Called SPDY4 internally. 23 "npn-h2-12", // HTTP/2 draft 12. Called SPDY4 internally.
24 "quic" 24 "quic"
25 }; 25 };
26 const char kBrokenAlternateProtocol[] = "Broken"; 26 const char kBrokenAlternateProtocol[] = "Broken";
27 27
28 COMPILE_ASSERT( 28 COMPILE_ASSERT(
29 arraysize(kAlternateProtocolStrings) == NUM_VALID_ALTERNATE_PROTOCOLS, 29 arraysize(kAlternateProtocolStrings) == NUM_VALID_ALTERNATE_PROTOCOLS,
30 kAlternateProtocolStringsSize_kNumValidAlternateProtocols_not_equal); 30 kAlternateProtocolStringsSize_kNumValidAlternateProtocols_not_equal);
31 31
32 } // namespace 32 } // namespace
33 33
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 NOTREACHED() << "Invalid NextProto: " << next_proto; 99 NOTREACHED() << "Invalid NextProto: " << next_proto;
100 return UNINITIALIZED_ALTERNATE_PROTOCOL; 100 return UNINITIALIZED_ALTERNATE_PROTOCOL;
101 } 101 }
102 102
103 std::string PortAlternateProtocolPair::ToString() const { 103 std::string PortAlternateProtocolPair::ToString() const {
104 return base::StringPrintf("%d:%s", port, 104 return base::StringPrintf("%d:%s", port,
105 AlternateProtocolToString(protocol)); 105 AlternateProtocolToString(protocol));
106 } 106 }
107 107
108 } // namespace net 108 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_response_info.cc ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698