diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 17:30:37 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 17:30:37 +0000 |
| commit | bdbda4656e353e11016a2946d3e5a6eb824bb8ac (patch) | |
| tree | e416d641cdabac98d3bc5fa055811158f785dc6b /net/spdy/spdy_session_pool.cc | |
| parent | 4457384fc143316ce58d65b6b356329ff1b3f16e (diff) | |
| download | chromium_src-bdbda4656e353e11016a2946d3e5a6eb824bb8ac.zip chromium_src-bdbda4656e353e11016a2946d3e5a6eb824bb8ac.tar.gz chromium_src-bdbda4656e353e11016a2946d3e5a6eb824bb8ac.tar.bz2 | |
SPDY: Make sure we don't try to send https/wss over an unauthenticated, but encrypted SSL socket.
BUG=46924
Review URL: http://codereview.chromium.org/2805039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session_pool.cc')
| -rw-r--r-- | net/spdy/spdy_session_pool.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc index 3374a2e..21fa0ac 100644 --- a/net/spdy/spdy_session_pool.cc +++ b/net/spdy/spdy_session_pool.cc @@ -53,17 +53,19 @@ net::Error SpdySessionPool::GetSpdySessionFromSSLSocket( HttpNetworkSession* session, ClientSocketHandle* connection, const BoundNetLog& net_log, - scoped_refptr<SpdySession>& spdy_session) { + int certificate_error_code, + scoped_refptr<SpdySession>* spdy_session) { // Create the SPDY session and add it to the pool. - spdy_session = (new SpdySession(host_port_pair, session, net_log.net_log())); + *spdy_session = new SpdySession(host_port_pair, session, net_log.net_log()); SpdySessionList* list = GetSessionList(host_port_pair); if (!list) list = AddSessionList(host_port_pair); DCHECK(list->empty()); - list->push_back(spdy_session); + list->push_back(*spdy_session); // Now we can initialize the session with the SSL socket. - return spdy_session->InitializeWithSSLSocket(connection); + return (*spdy_session)->InitializeWithSSLSocket(connection, + certificate_error_code); } bool SpdySessionPool::HasSession(const HostPortPair& host_port_pair) const { |