summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 19:24:18 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 19:24:18 +0000
commitcee73c753abc6d04759b0bcff5622906bdbc6622 (patch)
tree4f93b8b2fd2bc90250ee4c4c64401b425900300a /net/spdy
parent4dfddbd327719fe9e096bcc983062ab9684682ca (diff)
downloadchromium_src-cee73c753abc6d04759b0bcff5622906bdbc6622.zip
chromium_src-cee73c753abc6d04759b0bcff5622906bdbc6622.tar.gz
chromium_src-cee73c753abc6d04759b0bcff5622906bdbc6622.tar.bz2
Make SpdySession::GetSSLInfo work when the SpdySession is constructed
using SpdySession::InitializeWithSocket. The is_secure_ member needs to be set to true. R=willchan BUG=none TEST=Use SPDY with Next Protocol Negotiation (NPN). Chrome should show a lock icon and should be able to display the server certificate. Review URL: http://codereview.chromium.org/646074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_session.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 5019176..3560fd8e 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -249,6 +249,10 @@ void SpdySession::InitializeWithSocket(ClientSocketHandle* connection) {
state_ = CONNECTED;
connection_.reset(connection);
+ // InitializeWithSocket is called only when we use NPN (next protocol
+ // negotiation), which is a TLS extension, so |connection| must contain an
+ // SSLClientSocket.
+ is_secure_ = true;
// This is a newly initialized session that no client should have a handle to
// yet, so there's no need to start writing data as in OnTCPConnect(), but we