diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 23:00:27 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 23:00:27 +0000 |
| commit | 7ffbe12a589f266eea0932fbf89066a6e4d7bbd5 (patch) | |
| tree | e482c09705f5b9356aac484cc6272e8b989a92b6 /net | |
| parent | 82ea3444b6810dff8876c933f6ce57476482af4f (diff) | |
| download | chromium_src-7ffbe12a589f266eea0932fbf89066a6e4d7bbd5.zip chromium_src-7ffbe12a589f266eea0932fbf89066a6e4d7bbd5.tar.gz chromium_src-7ffbe12a589f266eea0932fbf89066a6e4d7bbd5.tar.bz2 | |
Clobber the state of the next-protocol-negotiation when disabling spdy.
We basically have two sets of config for SPDY - one is a general enablement
flag, the other is the next-protocol advertisement. We previously could
configure to advertise SPDY over NPN, but have SPDY disabled; this would lead
to the bug with broken 'download' when accessing a SPDY page.
BUG=66891
TEST=none
Review URL: http://codereview.chromium.org/6007002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_stream_factory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index f90992d..c5a0dc3 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -66,6 +66,8 @@ class HttpStreamFactory : public StreamFactory, // Turns spdy on or off. static void set_spdy_enabled(bool value) { spdy_enabled_ = value; + if (value == false) + set_next_protos(""); } static bool spdy_enabled() { return spdy_enabled_; } |