SPDY Proxy - Bug fix to handle flow control (spdy/2.1)

net/spdy/spdy_proxy_client_socket.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_proxy_client_socket.h"
 
 #include <algorithm>  // min
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 153 matching lines @@
     return ERR_IO_PENDING;
   }
   user_buffer_ = NULL;
   return result;
 }
 
 int SpdyProxyClientSocket::PopulateUserReadBuffer() {
   if (!user_buffer_)
     return ERR_IO_PENDING;
 
+  int bytes_read = 0;
   while (!read_buffer_.empty() && user_buffer_->BytesRemaining() > 0) {
     scoped_refptr<DrainableIOBuffer> data = read_buffer_.front();
     const int bytes_to_copy = std::min(user_buffer_->BytesRemaining(),
                                        data->BytesRemaining());
     memcpy(user_buffer_->data(), data->data(), bytes_to_copy);

[willchan no longer on Chromium, 2012/02/14 06:11:48]

Don't you need to do
bytes_read += bytes_to_copy?

[ramant (doing other things), 2012/02/14 06:34:28]

I lost that change when I moved my change from one tree to another tree. Thanks
for catching it. Tested it with the above statement.

Done.

     user_buffer_->DidConsume(bytes_to_copy);
     if (data->BytesRemaining() == bytes_to_copy) {
       // Consumed all data from this buffer
       read_buffer_.pop_front();
     } else {
       data->DidConsume(bytes_to_copy);
     }
   }
 
+  if (bytes_read > 0) {
+    DCHECK(spdy_stream_);
+    spdy_stream_->IncreaseRecvWindowSize(bytes_read);
+  }
   return user_buffer_->BytesConsumed();
 }
 
 int SpdyProxyClientSocket::Write(IOBuffer* buf, int buf_len,
                                  const CompletionCallback& callback) {
   DCHECK(write_callback_.is_null());
   if (next_state_ != STATE_OPEN)
     return ERR_SOCKET_NOT_CONNECTED;
 
   DCHECK(spdy_stream_);
@@ skipping 308 matching lines @@
   }
   // This may have been deleted by read_callback_, so check first.
   if (weak_ptr && !write_callback.is_null())
     write_callback.Run(ERR_CONNECTION_CLOSED);
 }
 
 void SpdyProxyClientSocket::set_chunk_callback(ChunkCallback* /*callback*/) {
 }
 
 }  // namespace net