diff options
| author | bnc <bnc@chromium.org> | 2014-11-06 16:52:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 00:53:02 +0000 |
| commit | 4c3b71b800b5cb02a6298e590b2c551c6ec5fe61 (patch) | |
| tree | ba3832f7d7565d39159269db00026f8cbecfaa29 /chrome/browser/io_thread.cc | |
| parent | 0cde643ab94746c5b792e3a1217e4b79a5edb35a (diff) | |
| download | chromium_src-4c3b71b800b5cb02a6298e590b2c551c6ec5fe61.zip chromium_src-4c3b71b800b5cb02a6298e590b2c551c6ec5fe61.tar.gz chromium_src-4c3b71b800b5cb02a6298e590b2c551c6ec5fe61.tar.bz2 | |
Deprecate SPDY/3.0 support.
This CL removes SPDY/3.0 from the list of supported protocols for the NPN and ALPN protocol negotiation extensions.
BUG=428086
Review URL: https://codereview.chromium.org/708623002
Cr-Commit-Position: refs/heads/master@{#303140}
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 87ab0c7..29c83a7 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -897,11 +897,11 @@ void IOThread::EnableSpdy(const std::string& mode) { if (option == kOff) { net::HttpStreamFactory::set_spdy_enabled(false); } else if (option == kDisableSSL) { - globals_->spdy_default_protocol.set(net::kProtoSPDY3); + globals_->spdy_default_protocol.set(net::kProtoSPDY31); globals_->force_spdy_over_ssl.set(false); globals_->force_spdy_always.set(true); } else if (option == kSSL) { - globals_->spdy_default_protocol.set(net::kProtoSPDY3); + globals_->spdy_default_protocol.set(net::kProtoSPDY31); globals_->force_spdy_over_ssl.set(true); globals_->force_spdy_always.set(true); } else if (option == kDisablePing) { |