| Index: net/http/http_server_properties.cc
|
| diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
|
| index 6b5f226cad0b185d3de64a58b61b024ad2456103..bdeb1bf0d20e9e580f463e963a0ca42c80cbac49 100644
|
| --- a/net/http/http_server_properties.cc
|
| +++ b/net/http/http_server_properties.cc
|
| @@ -103,11 +103,21 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
|
|
|
| std::string AlternateProtocolInfo::ToString() const {
|
| return base::StringPrintf("%d:%s p=%f%s", port,
|
| - AlternateProtocolToString(protocol),
|
| - probability,
|
| + AlternateProtocolToString(protocol), probability,
|
| is_broken ? " (broken)" : "");
|
| }
|
|
|
| +std::string AlternateProtocolsToString(const AlternateProtocols& protocols) {
|
| + std::string output;
|
| + for (AlternateProtocols::const_iterator it = protocols.begin();
|
| + it != protocols.end(); ++it) {
|
| + if (!output.empty())
|
| + output.append("; ");
|
| + output.append(it->ToString());
|
| + }
|
| + return output;
|
| +}
|
| +
|
| // static
|
| void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
|
| ssl_config->next_protos.clear();
|
|
|