diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 00:08:04 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 00:08:04 +0000 |
| commit | 8d2f701772ce1f81e65f49569f601f4bc491d918 (patch) | |
| tree | 74b569f1d642207f58cf369de2cf17b345e91ba8 /net/http/http_network_layer.cc | |
| parent | 2493fb1980d8d18615906567a4fb732cd38b9425 (diff) | |
| download | chromium_src-8d2f701772ce1f81e65f49569f601f4bc491d918.zip chromium_src-8d2f701772ce1f81e65f49569f601f4bc491d918.tar.gz chromium_src-8d2f701772ce1f81e65f49569f601f4bc491d918.tar.bz2 | |
SPDY - enable SPDY/2.1 (flow control).
This change is an almost a revert of the following CL.
http://src.chromium.org/viewvc/chrome?view=rev&revision=121964
R=willchan
BUG=114312
TEST=network unit tests, upload large file and test with SPDY proxy
Review URL: https://chromiumcodereview.appspot.com/9363067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_layer.cc')
| -rw-r--r-- | net/http/http_network_layer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 36f2c86..672700f 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -101,6 +101,7 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) { 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); } else if (option == kEnableNpnHttpOnly) { // Avoid alternate protocol in this case. Otherwise, browser will try SSL @@ -129,7 +130,7 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) { } else if (option == kForceAltProtocols) { PortAlternateProtocolPair pair; pair.port = 443; - pair.protocol = NPN_SPDY_2; + pair.protocol = NPN_SPDY_21; HttpServerPropertiesImpl::ForceAlternateProtocol(pair); } else if (option == kSingleDomain) { SpdySessionPool::ForceSingleDomain(); |