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

Unified Diff: net/spdy/spdy_stream.cc

Issue 304353012: Introduce STATE_RESERVED_REMOTE. No behavioral changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix SpdyNetworkTransactionTest.ServerPushWithTwoHeaderFrames Created 6 years, 7 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
Index: net/spdy/spdy_stream.cc
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 682eb466014794272f1b4789c78a8d9042c4e25a..25c68c530c41f273f8b9966f50843301cea320ae 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -122,6 +122,8 @@ void SpdyStream::SetDelegate(Delegate* delegate) {
CHECK(delegate);
delegate_ = delegate;
+ // TODO(baranovich): allow STATE_RESERVED_REMOTE when push promises will be
+ // implemented.
CHECK(io_state_ == STATE_IDLE ||
io_state_ == STATE_HALF_CLOSED_LOCAL_UNCLAIMED);
@@ -417,9 +419,11 @@ int SpdyStream::OnInitialResponseHeadersReceived(
// Push streams transition to a locally half-closed state upon headers.
// We must continue to buffer data while waiting for a call to
// SetDelegate() (which may not ever happen).
- // TODO(jgraettinger): When PUSH_PROMISE is added, Handle RESERVED_REMOTE
- // cases here depending on whether the delegate is already set.
- CHECK_EQ(io_state_, STATE_IDLE);
+ // TODO(baranovich): For HTTP 2 push streams, delegate may be set before
+ // receiving response headers when PUSH_PROMISE will be implemented.
+ // TODO(baranovich): In HTTP 2 additional HEADERS frames are not allowed.
+ // Set |response_headers_status_| to RESPONSE_HEADERS_ARE_COMPLETE.
+ CHECK_EQ(io_state_, STATE_RESERVED_REMOTE);
DCHECK(!delegate_);
io_state_ = STATE_HALF_CLOSED_LOCAL_UNCLAIMED;
break;
@@ -451,6 +455,18 @@ int SpdyStream::OnAdditionalResponseHeadersReceived(
return MergeWithResponseHeaders(additional_response_headers);
}
+
+int SpdyStream::OnPushPromiseHeadersReceived(const SpdyHeaderBlock& headers) {
+ CHECK(!request_headers_.get());
+ CHECK_EQ(io_state_, STATE_IDLE);
+ CHECK_EQ(type_, SPDY_PUSH_STREAM);
+ DCHECK(!delegate_);
+
+ io_state_ = STATE_RESERVED_REMOTE;
+ request_headers_.reset(new SpdyHeaderBlock(headers));
+ return OK;
+}
+
void SpdyStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
DCHECK(session_->IsStreamActive(stream_id_));
@@ -730,12 +746,10 @@ bool SpdyStream::GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const {
}
GURL SpdyStream::GetUrlFromHeaders() const {
- if (type_ != SPDY_PUSH_STREAM && !request_headers_)
+ if (!request_headers_)
return GURL();
- const SpdyHeaderBlock& headers =
- (type_ == SPDY_PUSH_STREAM) ? response_headers_ : *request_headers_;
- return GetUrlFromHeaderBlock(headers, GetProtocolVersion(),
+ return GetUrlFromHeaderBlock(*request_headers_, GetProtocolVersion(),
type_ == SPDY_PUSH_STREAM);
}

Powered by Google App Engine
This is Rietveld 408576698