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

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

Issue 665083009: ABANDONED Handle multiple AlternateProtocols for each HostPortPair. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 11 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
« no previous file with comments | « net/http/http_server_properties.h ('k') | net/http/http_server_properties_impl.h » ('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 #include "net/socket/ssl_client_socket.h" 10 #include "net/socket/ssl_client_socket.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 case kProtoHTTP11: 96 case kProtoHTTP11:
97 break; 97 break;
98 } 98 }
99 99
100 NOTREACHED() << "Invalid NextProto: " << next_proto; 100 NOTREACHED() << "Invalid NextProto: " << next_proto;
101 return UNINITIALIZED_ALTERNATE_PROTOCOL; 101 return UNINITIALIZED_ALTERNATE_PROTOCOL;
102 } 102 }
103 103
104 std::string AlternateProtocolInfo::ToString() const { 104 std::string AlternateProtocolInfo::ToString() const {
105 return base::StringPrintf("%d:%s p=%f%s", port, 105 return base::StringPrintf("%d:%s p=%f%s", port,
106 AlternateProtocolToString(protocol), 106 AlternateProtocolToString(protocol), probability,
107 probability,
108 is_broken ? " (broken)" : ""); 107 is_broken ? " (broken)" : "");
109 } 108 }
110 109
110 std::string AlternateProtocolsToString(const AlternateProtocols& protocols) {
111 std::string output{};
Bence 2015/01/30 21:24:50 I don't think this format is currently allowed.
Ryan Hamilton 2015/01/30 21:50:19 the {}s? What's different from simply doing std::s
112 for (AlternateProtocols::const_iterator it = protocols.begin();
113 it != protocols.end(); ++it) {
114 output.append(it->ToString());
115 output.append("; ");
116 }
117 return output;
118 }
119
111 // static 120 // static
112 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) { 121 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
113 ssl_config->next_protos.clear(); 122 ssl_config->next_protos.clear();
114 ssl_config->next_protos.push_back(kProtoHTTP11); 123 ssl_config->next_protos.push_back(kProtoHTTP11);
115 } 124 }
116 125
117 } // namespace net 126 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_server_properties.h ('k') | net/http/http_server_properties_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698