[SPDY] Fix bug where a SPDY stream might not unstall properly in all cases

net/spdy/spdy_session.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_session.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 778 matching lines @@
         "Net.SpdyFrameStreamAndSessionFlowControlState",
         frame_flow_control_state,
         SEND_STALLED_BY_STREAM_AND_SESSION + 1);
   }
 
   // Obey send window size of the stream if stream flow control is
   // enabled.
   if (flow_control_state_ >= FLOW_CONTROL_STREAM) {
     if (send_stalled_by_stream) {
       stream->set_send_stalled_by_flow_control(true);
+      // Even though we're currently stalled only by the stream, we
+      // might end up being stalled by the session also.
+      QueueSendStalledStream(stream);
       net_log().AddEvent(
           NetLog::TYPE_SPDY_SESSION_STREAM_STALLED_BY_STREAM_SEND_WINDOW,
           NetLog::IntegerCallback("stream_id", stream_id));
       return scoped_ptr<SpdyBuffer>();
     }
 
     effective_len = std::min(effective_len, stream->send_window_size());
   }
 
   // Obey send window size of the session if session flow control is
@@ skipping 1595 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net