diff options
| author | erikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 23:09:15 +0000 |
|---|---|---|
| committer | erikchen@google.com <erikchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 23:09:15 +0000 |
| commit | 9e9e842e287f9f949aa59bcf88321fa7f94fd524 (patch) | |
| tree | b84963a14d5c7a4a7908d268320d29bb40b726b2 /net/spdy/spdy_session.cc | |
| parent | 148971b8a6efa47182662a17c8e7b455043fb632 (diff) | |
| download | chromium_src-9e9e842e287f9f949aa59bcf88321fa7f94fd524.zip chromium_src-9e9e842e287f9f949aa59bcf88321fa7f94fd524.tar.gz chromium_src-9e9e842e287f9f949aa59bcf88321fa7f94fd524.tar.bz2 | |
SPDY now always uses http_network_transaction instead of spdy_network_transaction.
It was previously possible to use spdy_network_transaction using the command line flags:
--use-spdy=no-ssl
--use-spdy=no-compress
This does not affect instances of chrome that are not run with --use-spdy.
Also changed spdy_network_transaction_unittest so that all tests are run with 3 different connection configurations: spdy over npn, spdy over ssl, and spdy without ssl.
TEST=net_unittests
BUG=49082
Review URL: http://codereview.chromium.org/3048003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.cc')
| -rw-r--r-- | net/spdy/spdy_session.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index a5bebf5..26b6a10 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -198,8 +198,9 @@ SpdySession::~SpdySession() { net_log_.EndEvent(NetLog::TYPE_SPDY_SESSION, NULL); } -net::Error SpdySession::InitializeWithSSLSocket( +net::Error SpdySession::InitializeWithSocket( ClientSocketHandle* connection, + bool is_secure, int certificate_error_code) { static StatsCounter spdy_sessions("spdy.sessions"); spdy_sessions.Increment(); @@ -208,7 +209,7 @@ net::Error SpdySession::InitializeWithSSLSocket( state_ = CONNECTED; connection_.reset(connection); - is_secure_ = true; // |connection| contains an SSLClientSocket. + is_secure_ = is_secure; certificate_error_code_ = certificate_error_code; // This is a newly initialized session that no client should have a handle to |