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

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

Issue 2243453002: Replace SSLProtocolNegotiation histogram with SSLNegotiatedAlpnProtocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #18. Created 4 years, 3 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
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_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "net/socket/ssl_client_socket.h" 10 #include "net/socket/ssl_client_socket.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) { 63 AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
64 switch (next_proto) { 64 switch (next_proto) {
65 case kProtoHTTP2: 65 case kProtoHTTP2:
66 return NPN_HTTP_2; 66 return NPN_HTTP_2;
67 case kProtoQUIC1SPDY3: 67 case kProtoQUIC1SPDY3:
68 return QUIC; 68 return QUIC;
69 69
70 case kProtoUnknown: 70 case kProtoUnknown:
71 case kProtoHTTP11: 71 case kProtoHTTP11:
72 case kProtoNumberOfNextProtos:
72 break; 73 break;
73 } 74 }
74 75
75 NOTREACHED() << "Invalid NextProto: " << next_proto; 76 NOTREACHED() << "Invalid NextProto: " << next_proto;
76 return UNINITIALIZED_ALTERNATE_PROTOCOL; 77 return UNINITIALIZED_ALTERNATE_PROTOCOL;
77 } 78 }
78 79
79 std::string AlternativeService::ToString() const { 80 std::string AlternativeService::ToString() const {
80 return base::StringPrintf("%s %s:%d", AlternateProtocolToString(protocol), 81 return base::StringPrintf("%s %s:%d", AlternateProtocolToString(protocol),
81 host.c_str(), port); 82 host.c_str(), port);
(...skipping 10 matching lines...) Expand all
92 93
93 // static 94 // static
94 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) { 95 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
95 ssl_config->alpn_protos.clear(); 96 ssl_config->alpn_protos.clear();
96 ssl_config->alpn_protos.push_back(kProtoHTTP11); 97 ssl_config->alpn_protos.push_back(kProtoHTTP11);
97 ssl_config->npn_protos.clear(); 98 ssl_config->npn_protos.clear();
98 ssl_config->npn_protos.push_back(kProtoHTTP11); 99 ssl_config->npn_protos.push_back(kProtoHTTP11);
99 } 100 }
100 101
101 } // namespace net 102 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698