Implement PUSH_PROMISE handling in spdy_session

net/spdy/spdy_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_stream.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 105 matching lines @@
   CHECK(!write_handler_guard_);
   UpdateHistograms();
 }
 
 void SpdyStream::SetDelegate(Delegate* delegate) {
   CHECK(!delegate_);
   CHECK(delegate);
   delegate_ = delegate;
 
   // TODO(baranovich): allow STATE_RESERVED_REMOTE when push promises will be
   // implemented.

[Johnny, 2014/06/17 04:01:33]

Remove TODO

[baranovich, 2014/06/17 21:33:43]

Done.

   CHECK(io_state_ == STATE_IDLE ||
-        io_state_ == STATE_HALF_CLOSED_LOCAL_UNCLAIMED);
+        io_state_ == STATE_HALF_CLOSED_LOCAL_UNCLAIMED ||
+        io_state_ == STATE_RESERVED_REMOTE);
 
   if (io_state_ == STATE_HALF_CLOSED_LOCAL_UNCLAIMED) {
     DCHECK_EQ(type_, SPDY_PUSH_STREAM);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&SpdyStream::PushedStreamReplay, GetWeakPtr()));
   }
 }
 
 void SpdyStream::PushedStreamReplay() {
@@ skipping 273 matching lines @@
         session_->ResetStream(stream_id_, RST_STREAM_PROTOCOL_ERROR,
                               "Response received before request sent");
         return ERR_SPDY_PROTOCOL_ERROR;
       }
       break;
 
     case SPDY_PUSH_STREAM:
       // 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(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;
+      if (!delegate_) {
+        io_state_ = STATE_HALF_CLOSED_LOCAL_UNCLAIMED;
+      } else {
+        io_state_ = STATE_HALF_CLOSED_LOCAL;
+      }
       break;
   }
 
   metrics_.StartStream();
 
   DCHECK_NE(io_state_, STATE_IDLE);
 
   response_time_ = response_time;
   recv_first_byte_time_ = recv_first_byte_time;
   return MergeWithResponseHeaders(initial_response_headers);
@@ skipping 463 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net