summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session_pool.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-28 17:30:37 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-28 17:30:37 +0000
commitbdbda4656e353e11016a2946d3e5a6eb824bb8ac (patch)
treee416d641cdabac98d3bc5fa055811158f785dc6b /net/spdy/spdy_session_pool.h
parent4457384fc143316ce58d65b6b356329ff1b3f16e (diff)
downloadchromium_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.h')
-rw-r--r--net/spdy/spdy_session_pool.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 3ea97f3..321f55c 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -47,6 +47,8 @@ class SpdySessionPool
// calling Get() first to use an existing SpdySession so we don't get
// multiple SpdySessions per domain. Note that ownership of |connection| is
// transferred from the caller to the SpdySession.
+ // |certificate_error_code| is used to indicate the certificate error
+ // encountered when connecting the SSL socket. OK means there was no error.
// Returns OK on success, and the |spdy_session| will be provided.
// Returns an error on failure, and |spdy_session| will be NULL.
net::Error GetSpdySessionFromSSLSocket(
@@ -54,7 +56,8 @@ class SpdySessionPool
HttpNetworkSession* session,
ClientSocketHandle* connection,
const BoundNetLog& net_log,
- scoped_refptr<SpdySession>& spdy_session);
+ int certificate_error_code,
+ scoped_refptr<SpdySession>* spdy_session);
// TODO(willchan): Consider renaming to HasReusableSession, since perhaps we
// should be creating a new session.