diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 01:36:31 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 01:36:31 +0000 |
| commit | 8d96d6fb98e8430d5348c3ad7dcf8e85a4dfad3d (patch) | |
| tree | 5ae9785629098bc062f8d80136310b05e9e35384 /net | |
| parent | 47cc17fd7dc980a3dc675da573805cabfa596b3e (diff) | |
| download | chromium_src-8d96d6fb98e8430d5348c3ad7dcf8e85a4dfad3d.zip chromium_src-8d96d6fb98e8430d5348c3ad7dcf8e85a4dfad3d.tar.gz chromium_src-8d96d6fb98e8430d5348c3ad7dcf8e85a4dfad3d.tar.bz2 | |
Remove agl's NPN in SpdySession hack.
This will prevent us from attempting NPN when --use_spdy is true, but not the "npn" option is not specified.
Review URL: http://codereview.chromium.org/633006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_session.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 9879306..5019176 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -211,17 +211,6 @@ SpdySession::SpdySession(const std::string& host, HttpNetworkSession* session) spdy_framer_.set_visitor(this); session_->ssl_config_service()->GetSSLConfig(&ssl_config_); - - // TODO(agl): This is a temporary hack for testing reasons. In the medium - // term we'll want to use NPN for all HTTPS connections and use the protocol - // suggested. - // - // In the event that the server supports Next Protocol Negotiation, but - // doesn't support either of these protocols, we'll request the first - // protocol in the list. Because of that, HTTP is listed first because it's - // what we'll actually fallback to in the case that the server doesn't - // support SPDY. - ssl_config_.next_protos = "\007http1.1\004spdy"; } SpdySession::~SpdySession() { |