SPDY - disable spdy/2.1 (flow control) by default

net/http/http_network_layer.cc

Index: net/http/http_network_layer.cc
===================================================================
--- net/http/http_network_layer.cc	(revision 124201)
+++ net/http/http_network_layer.cc	(working copy)
@@ -101,8 +101,8 @@
       std::vector<std::string> next_protos;
       next_protos.push_back("http/1.1");
       next_protos.push_back("spdy/2");
-      next_protos.push_back("spdy/2.1");
       HttpStreamFactory::set_next_protos(next_protos);
+      HttpStreamFactory::set_supported_spdy_version(NPN_SPDY_2);
     } else if (option == kEnableNpnHttpOnly) {
       // Avoid alternate protocol in this case. Otherwise, browser will try SSL
       // and then fallback to http. This introduces extra load.
@@ -127,11 +127,13 @@
       next_protos.push_back("spdy/2");
       next_protos.push_back("spdy/2.1");
       HttpStreamFactory::set_next_protos(next_protos);
+      HttpStreamFactory::set_supported_spdy_version(NPN_SPDY_21);
     } else if (option == kForceAltProtocols) {
       PortAlternateProtocolPair pair;
       pair.port = 443;
-      pair.protocol = NPN_SPDY_21;
+      pair.protocol = NPN_SPDY_2;
       HttpServerPropertiesImpl::ForceAlternateProtocol(pair);
+      HttpStreamFactory::set_supported_spdy_version(NPN_SPDY_2);
     } else if (option == kSingleDomain) {
       SpdySessionPool::ForceSingleDomain();
       LOG(ERROR) << "FORCING SINGLE DOMAIN";