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

Unified Diff: net/spdy/spdy_session_pool.h

Issue 2862027: Fix crash in GetSpdySessionFromSSLSocket in the case where the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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
===================================================================
--- net/spdy/spdy_session_pool.h (revision 50644)
+++ net/spdy/spdy_session_pool.h (working copy)
@@ -13,6 +13,7 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "net/base/host_port_pair.h"
+#include "net/base/net_errors.h"
#include "net/base/network_change_notifier.h"
namespace net {
@@ -47,11 +48,14 @@
// 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.
- scoped_refptr<SpdySession> GetSpdySessionFromSSLSocket(
+ // 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(
const HostPortPair& host_port_pair,
HttpNetworkSession* session,
ClientSocketHandle* connection,
- const BoundNetLog& net_log);
+ const BoundNetLog& net_log,
+ 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