Index: net/spdy/spdy_session.cc |
=================================================================== |
--- net/spdy/spdy_session.cc (revision 113335) |
+++ net/spdy/spdy_session.cc (working copy) |
@@ -336,6 +336,7 @@ |
state_ = CONNECTED; |
connection_.reset(connection); |
+ connection_->AddLayeredPool(this); |
is_secure_ = is_secure; |
certificate_error_code_ = certificate_error_code; |
@@ -984,6 +985,15 @@ |
return connection_->socket()->GetLocalAddress(address); |
} |
+bool SpdySession::CloseOneIdleConnection() { |
+ if (num_active_streams() == 0) { |
+ // Should delete this. |
+ RemoveFromPool(); |
+ return true; |
+ } |
+ return false; |
+} |
+ |
void SpdySession::ActivateStream(SpdyStream* stream) { |
const spdy::SpdyStreamId id = stream->stream_id(); |
DCHECK(!IsStreamActive(id)); |
@@ -1018,12 +1028,18 @@ |
if (stream) |
stream->OnClose(status); |
ProcessPendingCreateStreams(); |
+ if (num_active_streams() == 0 && connection_->is_initialized() && |
+ connection_->IsPoolStalled()) { |
+ // Should delete this. |
+ RemoveFromPool(); |
+ } |
} |
void SpdySession::RemoveFromPool() { |
if (spdy_session_pool_) { |
- spdy_session_pool_->Remove(make_scoped_refptr(this)); |
+ SpdySessionPool* pool = spdy_session_pool_; |
spdy_session_pool_ = NULL; |
+ pool->Remove(make_scoped_refptr(this)); |
} |
} |