Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1336)

Unified Diff: net/spdy/spdy_session_pool.h

Issue 2805039: SPDY: Make sure we don't try to send https/wss over an unauthenticated, but encrypted SSL socket. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Propagate error codes. Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_pool.h
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 3ea97f37113dd50da4e4b44a99b4f3d96979bd85..321f55cd1b56475375712a13e6e2666fb9adc8ce 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.
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698