diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:57:54 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:57:54 +0000 |
| commit | 3231b619a191e753e8b64c2061a1d5e2c99aa8b7 (patch) | |
| tree | 988e5117e505d24f0c97b02b52c2c64f5def101b /net/http/http_stream_factory.cc | |
| parent | 04797250b8e2c836b5701390e1443ac45aa4208a (diff) | |
| download | chromium_src-3231b619a191e753e8b64c2061a1d5e2c99aa8b7.zip chromium_src-3231b619a191e753e8b64c2061a1d5e2c99aa8b7.tar.gz chromium_src-3231b619a191e753e8b64c2061a1d5e2c99aa8b7.tar.bz2 | |
SPDY - Added enabling of SPDY/3 and SPDY flow control to
about:flags.
Added command line switches --enable-spdy3 to enable
SPDY/3 and --enable-spdy-flow-control to enable flow control (SPDY/2.1).
Added Field Trials for SPDY/2.1 and SPDY/3. The FieldTrials are enabled
when SPDY/3 and flow control command line options are not chosen.
Removed --use-spdy=v3 and --use-spdy=flow-control options.
BUG=118440,119205
R=willchan
TEST=Netowrk unit tests and browser tests.
Enable SPDY/3 in about:flags and see in chrome://net-internals
that SPDY/2, SPDY/2.1 and SPDY/3 are displayed as the protocols
supported.
Enable SPDY FLow Control in about:flags and see in chrome://net-internals
that SPDY/2 and SPDY/2.1 are displayed as the protocols supported.
Review URL: http://codereview.chromium.org/9766021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory.cc')
| -rw-r--r-- | net/http/http_stream_factory.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index dda9951..dee1874 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -149,6 +149,25 @@ bool HttpStreamFactory::HasSpdyExclusion(const HostPortPair& endpoint) { } // static +void HttpStreamFactory::EnableFlowControl() { + 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"); + SetNextProtos(next_protos); +} + +// static +void HttpStreamFactory::EnableSPDY3() { + 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"); + next_protos.push_back("spdy/3"); + SetNextProtos(next_protos); +} + +// static void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) { if (!next_protos_) next_protos_ = new std::vector<std::string>; |