diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 23:26:43 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 23:26:43 +0000 |
| commit | d165dc77beb36482ec850095a3d18e512a3ede72 (patch) | |
| tree | 395ca7d04cafa4eedd7a54bd038ecd7dcb13d896 /net/http/http_stream_factory.cc | |
| parent | 13798bab912c0017d7a37faf39b3023f8a5a4c2c (diff) | |
| download | chromium_src-d165dc77beb36482ec850095a3d18e512a3ede72.zip chromium_src-d165dc77beb36482ec850095a3d18e512a3ede72.tar.gz chromium_src-d165dc77beb36482ec850095a3d18e512a3ede72.tar.bz2 | |
SPDY - trun off spdy/2.1 by default. It could be enabled
with command line option --use-spdy=flow-control.
The following are the two CL's that are related to spdy/2.1
http://codereview.chromium.org/8892026
http://codereview.chromium.org/9252029/
R=wtc
BUG=114105
TEST=test gmail, docs with spdy proxy enabled and disabled.
Review URL: http://codereview.chromium.org/9390027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory.cc')
| -rw-r--r-- | net/http/http_stream_factory.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index dd08c8d..2823946 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -82,7 +82,9 @@ void HttpStreamFactory::ProcessAlternateProtocol( AlternateProtocol protocol = ALTERNATE_PROTOCOL_BROKEN; // We skip NPN_SPDY_1 here, because we've rolled the protocol version to 2. - for (int i = NPN_SPDY_2; i < NUM_ALTERNATE_PROTOCOLS; ++i) { + // TODO(rtenneti): add support for SPDY/2.1 (use next_protos_ to determine the + // protocol). + for (int i = NPN_SPDY_2; i <= NPN_SPDY_2; ++i) { if (port_protocol_vector[1] == kAlternateProtocolStrings[i]) protocol = static_cast<AlternateProtocol>(i); } |