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

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

Issue 25977005: [SPDY] Do not advertise SPDY/2 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 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_server_properties.h ('k') | net/http/http_server_properties_impl_unittest.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/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 9
10 namespace net { 10 namespace net {
(...skipping 20 matching lines...) Expand all
31 31
32 } // namespace 32 } // namespace
33 33
34 bool IsAlternateProtocolValid(AlternateProtocol protocol) { 34 bool IsAlternateProtocolValid(AlternateProtocol protocol) {
35 return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION && 35 return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION &&
36 protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION; 36 protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
37 } 37 }
38 38
39 const char* AlternateProtocolToString(AlternateProtocol protocol) { 39 const char* AlternateProtocolToString(AlternateProtocol protocol) {
40 switch (protocol) { 40 switch (protocol) {
41 case NPN_SPDY_2: 41 case DEPRECATED_NPN_SPDY_2:
42 case NPN_SPDY_3: 42 case NPN_SPDY_3:
43 case NPN_SPDY_3_1: 43 case NPN_SPDY_3_1:
44 case NPN_SPDY_4A2: 44 case NPN_SPDY_4A2:
45 case NPN_HTTP2_DRAFT_04: 45 case NPN_HTTP2_DRAFT_04:
46 case QUIC: 46 case QUIC:
47 DCHECK(IsAlternateProtocolValid(protocol)); 47 DCHECK(IsAlternateProtocolValid(protocol));
48 return kAlternateProtocolStrings[ 48 return kAlternateProtocolStrings[
49 protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION]; 49 protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
50 case ALTERNATE_PROTOCOL_BROKEN: 50 case ALTERNATE_PROTOCOL_BROKEN:
51 return kBrokenAlternateProtocol; 51 return kBrokenAlternateProtocol;
(...skipping 11 matching lines...) Expand all
63 if (str == AlternateProtocolToString(protocol)) 63 if (str == AlternateProtocolToString(protocol))
64 return protocol; 64 return protocol;
65 } 65 }
66 if (str == kBrokenAlternateProtocol) 66 if (str == kBrokenAlternateProtocol)
67 return ALTERNATE_PROTOCOL_BROKEN; 67 return ALTERNATE_PROTOCOL_BROKEN;
68 return UNINITIALIZED_ALTERNATE_PROTOCOL; 68 return UNINITIALIZED_ALTERNATE_PROTOCOL;
69 } 69 }
70 70
71 AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) { 71 AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
72 switch (next_proto) { 72 switch (next_proto) {
73 case kProtoSPDY2: 73 case kProtoDeprecatedSPDY2:
74 return NPN_SPDY_2; 74 return DEPRECATED_NPN_SPDY_2;
75 case kProtoSPDY3: 75 case kProtoSPDY3:
76 return NPN_SPDY_3; 76 return NPN_SPDY_3;
77 case kProtoSPDY31: 77 case kProtoSPDY31:
78 return NPN_SPDY_3_1; 78 return NPN_SPDY_3_1;
79 case kProtoSPDY4a2: 79 case kProtoSPDY4a2:
80 return NPN_SPDY_4A2; 80 return NPN_SPDY_4A2;
81 case kProtoHTTP2Draft04: 81 case kProtoHTTP2Draft04:
82 return NPN_HTTP2_DRAFT_04; 82 return NPN_HTTP2_DRAFT_04;
83 case kProtoQUIC1SPDY3: 83 case kProtoQUIC1SPDY3:
84 return QUIC; 84 return QUIC;
85 85
86 case kProtoUnknown: 86 case kProtoUnknown:
87 case kProtoHTTP11: 87 case kProtoHTTP11:
88 break; 88 break;
89 } 89 }
90 90
91 NOTREACHED() << "Invalid NextProto: " << next_proto; 91 NOTREACHED() << "Invalid NextProto: " << next_proto;
92 return UNINITIALIZED_ALTERNATE_PROTOCOL; 92 return UNINITIALIZED_ALTERNATE_PROTOCOL;
93 } 93 }
94 94
95 std::string PortAlternateProtocolPair::ToString() const { 95 std::string PortAlternateProtocolPair::ToString() const {
96 return base::StringPrintf("%d:%s", port, 96 return base::StringPrintf("%d:%s", port,
97 AlternateProtocolToString(protocol)); 97 AlternateProtocolToString(protocol));
98 } 98 }
99 99
100 } // namespace net 100 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_server_properties.h ('k') | net/http/http_server_properties_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698