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

Unified Diff: net/spdy/spdy_session_pool.cc

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_pool.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_pool.cc
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 3374a2e17a4aad60d0c31046c88cd22dddcfd198..21fa0acd24388a7406af3ca65e0914a213b0b6e9 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 {
« no previous file with comments | « net/spdy/spdy_session_pool.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698