Add a probability to Alternate-Protocol support.

net/http/http_stream_factory.cc

Index: net/http/http_stream_factory.cc
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index 70d1101d07bd5e635d902a7a69ad61ca1c4bd29b..4ecd112310306682011005e47d72e8adf23292dc 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -1,99 +1,121 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/http/http_stream_factory.h"
-
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
-#include "net/base/host_mapping_rules.h"
-#include "net/base/host_port_pair.h"
-#include "net/http/http_network_session.h"
-#include "url/gurl.h"
-
-namespace net {
-
-// WARNING: If you modify or add any static flags, you must keep them in sync
-// with |ResetStaticSettingsToInit|. This is critical for unit test isolation.
-
-// static
-bool HttpStreamFactory::spdy_enabled_ = true;
-
-HttpStreamFactory::~HttpStreamFactory() {}
-
-// static
-void HttpStreamFactory::ResetStaticSettingsToInit() {
-  spdy_enabled_ = true;
-}
-
-void HttpStreamFactory::ProcessAlternateProtocol(
-    const base::WeakPtr<HttpServerProperties>& http_server_properties,
-    const std::string& alternate_protocol_str,
-    const HostPortPair& http_host_port_pair,
-    const HttpNetworkSession& session) {
-  std::vector<std::string> port_protocol_vector;
-  base::SplitString(alternate_protocol_str, ':', &port_protocol_vector);
-  if (port_protocol_vector.size() != 2) {
-    DVLOG(1) << kAlternateProtocolHeader
-             << " header has too many tokens: "
-             << alternate_protocol_str;
-    return;
-  }
-
-  int port;
-  if (!base::StringToInt(port_protocol_vector[0], &port) ||
-      port <= 0 || port >= 1 << 16) {
-    DVLOG(1) << kAlternateProtocolHeader
-             << " header has unrecognizable port: "
-             << port_protocol_vector[0];
-    return;
-  }
-
-  AlternateProtocol protocol =
-      AlternateProtocolFromString(port_protocol_vector[1]);
-  if (IsAlternateProtocolValid(protocol) &&
-      !session.IsProtocolEnabled(protocol)) {
-    protocol = ALTERNATE_PROTOCOL_BROKEN;
-  }
-
-  if (protocol == ALTERNATE_PROTOCOL_BROKEN) {
-    DVLOG(1) << kAlternateProtocolHeader
-             << " header has unrecognized protocol: "
-             << port_protocol_vector[1];
-    return;
-  }
-
-  HostPortPair host_port(http_host_port_pair);
-  const HostMappingRules* mapping_rules = GetHostMappingRules();
-  if (mapping_rules)
-    mapping_rules->RewriteHost(&host_port);
-
-  if (http_server_properties->HasAlternateProtocol(host_port)) {
-    const PortAlternateProtocolPair existing_alternate =
-        http_server_properties->GetAlternateProtocol(host_port);
-    // If we think the alternate protocol is broken, don't change it.
-    if (existing_alternate.protocol == ALTERNATE_PROTOCOL_BROKEN)
-      return;
-  }
-
-  http_server_properties->SetAlternateProtocol(host_port, port, protocol);
-}
-
-GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,
-                                              HostPortPair* endpoint) {
-  const HostMappingRules* mapping_rules = GetHostMappingRules();
-  if (mapping_rules && mapping_rules->RewriteHost(endpoint)) {
-    url::Replacements<char> replacements;
-    const std::string port_str = base::IntToString(endpoint->port());
-    replacements.SetPort(port_str.c_str(), url::Component(0, port_str.size()));
-    replacements.SetHost(endpoint->host().c_str(),
-                         url::Component(0, endpoint->host().size()));
-    return url.ReplaceComponents(replacements);
-  }
-  return url;
-}
-
-HttpStreamFactory::HttpStreamFactory() {}
-
-}  // namespace net
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "net/http/http_stream_factory.h"
+
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "net/base/host_mapping_rules.h"
+#include "net/base/host_port_pair.h"
+#include "net/http/http_network_session.h"
+#include "url/gurl.h"
+
+namespace net {
+
+// WARNING: If you modify or add any static flags, you must keep them in sync
+// with |ResetStaticSettingsToInit|. This is critical for unit test isolation.
+
+// static
+bool HttpStreamFactory::spdy_enabled_ = true;
+
+HttpStreamFactory::~HttpStreamFactory() {}
+
+// static
+void HttpStreamFactory::ResetStaticSettingsToInit() {
+  spdy_enabled_ = true;
+}
+
+void HttpStreamFactory::ProcessAlternateProtocol(
+    const base::WeakPtr<HttpServerProperties>& http_server_properties,
+    const std::vector<std::string>& alternate_protocol_values,
+    const HostPortPair& http_host_port_pair,
+    const HttpNetworkSession& session) {
+  AlternateProtocol protocol = UNINITIALIZED_ALTERNATE_PROTOCOL;
+  int port = 0;
+  double probability = 1;
+  for (size_t i = 0; i < alternate_protocol_values.size(); ++i) {

[ramant (doing other things), 2014/06/27 22:38:13]

Small question: Can alternate_protocol_values have more than 2 strings? I am
assuming alternate_protocol_values.size() will be less than 2.

[Ryan Hamilton, 2014/06/30 19:02:34]

If a server said:

Alternate-Protocol: 443:quic,443:npn-spdy,443:something-else

Then alternate_protocol_values would contain 3 strings. Does this sound right to
you?

[ramant (doing other things), 2014/06/30 21:01:23]

SGTM

+    const std::string& alternate_protocol_str = alternate_protocol_values[i];
+    if (StartsWithASCII(alternate_protocol_str, "p=", true)) {
+      if (!base::StringToDouble(alternate_protocol_str.substr(2),
+                                &probability) ||
+          probability < 0 || probability > 1) {
+        DVLOG(1) << kAlternateProtocolHeader
+                 << " header has unrecognizable probability: "
+                 << alternate_protocol_values[i];
+        return;
+      }
+      continue;
+    }
+

[ramant (doing other things), 2014/06/27 22:38:13]

nit: extra blank line.

[Ryan Hamilton, 2014/06/30 19:02:35]

Done.

+
+    std::vector<std::string> port_protocol_vector;
+    base::SplitString(alternate_protocol_str, ':', &port_protocol_vector);
+    if (port_protocol_vector.size() != 2) {
+      DVLOG(1) << kAlternateProtocolHeader
+               << " header has too many tokens: "
+               << alternate_protocol_str;
+      return;
+    }
+
+    if (!base::StringToInt(port_protocol_vector[0], &port) ||
+        port <= 0 || port >= 1 << 16) {
+      DVLOG(1) << kAlternateProtocolHeader
+               << " header has unrecognizable port: "
+               << port_protocol_vector[0];
+      return;
+    }
+
+    protocol =
+        AlternateProtocolFromString(port_protocol_vector[1]);
+    if (IsAlternateProtocolValid(protocol) &&
+        !session.IsProtocolEnabled(protocol)) {
+      protocol = ALTERNATE_PROTOCOL_BROKEN;
+    }
+
+    if (protocol == ALTERNATE_PROTOCOL_BROKEN) {
+      DVLOG(1) << kAlternateProtocolHeader
+               << " header has unrecognized protocol: "
+               << port_protocol_vector[1];
+      return;
+    }
+  }
+
+  if (protocol == UNINITIALIZED_ALTERNATE_PROTOCOL)
+    return;
+
+  HostPortPair host_port(http_host_port_pair);
+  const HostMappingRules* mapping_rules = GetHostMappingRules();
+  if (mapping_rules)
+    mapping_rules->RewriteHost(&host_port);
+
+  if (http_server_properties->HasAlternateProtocol(host_port)) {
+    const AlternateProtocolInfo existing_alternate =
+        http_server_properties->GetAlternateProtocol(host_port);
+    // If we think the alternate protocol is broken, don't change it.
+    if (existing_alternate.protocol == ALTERNATE_PROTOCOL_BROKEN)
+      return;
+  }
+  http_server_properties->SetAlternateProtocol(host_port, port, protocol,
+                                               probability);
+}
+
+GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,
+                                              HostPortPair* endpoint) {
+  const HostMappingRules* mapping_rules = GetHostMappingRules();
+  if (mapping_rules && mapping_rules->RewriteHost(endpoint)) {
+    url::Replacements<char> replacements;
+    const std::string port_str = base::IntToString(endpoint->port());
+    replacements.SetPort(port_str.c_str(), url::Component(0, port_str.size()));
+    replacements.SetHost(endpoint->host().c_str(),
+                         url::Component(0, endpoint->host().size()));
+    return url.ReplaceComponents(replacements);
+  }
+  return url;
+}
+
+HttpStreamFactory::HttpStreamFactory() {}
+
+}  // namespace net