Index: net/spdy/spdy_stream.cc |
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc |
index f3828d63e19ab375c6b53e2e547568f627b2db33..38338470cced79fcf8d939d88c7dc8126615feee 100644 |
--- a/net/spdy/spdy_stream.cc |
+++ b/net/spdy/spdy_stream.cc |
@@ -87,6 +87,8 @@ class SpdyStream::SpdyStreamIOBufferProducer |
} |
virtual SpdyIOBuffer* ProduceNextBuffer(SpdySession* session) OVERRIDE { |
+ if (stream_->cancelled()) |
+ return NULL; |
if (stream_->stream_id() == 0) |
SpdySession::SpdyIOBufferProducer::ActivateStream(session, stream_); |
frame_.reset(stream_->ProduceNextFrame()); |
@@ -526,6 +528,10 @@ void SpdyStream::Cancel() { |
cancelled_ = true; |
if (session_->IsStreamActive(stream_id_)) |
session_->ResetStream(stream_id_, CANCEL, ""); |
+ else |
+ session_->DeleteCreatedStream(this); |
+ |
+ CHECK(!session_->IsStreamActive(stream_id_)); |
} |
void SpdyStream::Close() { |