commit 1ed96ba2925c50e581ecbed1c2464aa55559e463
author Craig Tiller <ctiller@google.com> Thu Jul 23 11:38:31 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Jul 23 11:38:31 2015 -0700
tree 7514c1f86fb212d326ad1c24b34babb954d14a77
parent 5126bb6d8261ef07fb8132d5b5937f149cf315c8
parent 6f30decf79da066bb199163a820a31fb057c0157

Merge branch 'flow_control_buf_fix' of github.com:yang-g/grpc into virtuous-velvit-velociraptor

src/core/transport/chttp2/writing.c

diff --git a/src/core/transport/chttp2/writing.c b/src/core/transport/chttp2/writing.c
index d8ec117..041c4ef 100644
--- a/src/core/transport/chttp2/writing.c
+++ b/src/core/transport/chttp2/writing.c
@@ -66,7 +66,8 @@
   /* for each grpc_chttp2_stream that's become writable, frame it's data
      (according to
      available window sizes) and add to the output buffer */
-  while (grpc_chttp2_list_pop_writable_stream(transport_global,
+  while (transport_global->outgoing_window > 0 &&
+         grpc_chttp2_list_pop_writable_stream(transport_global,
                                               transport_writing, &stream_global,
                                               &stream_writing)) {
     stream_writing->id = stream_global->id;

test/cpp/end2end/end2end_test.cc

diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 20e4c4e..c433b78 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -144,6 +144,11 @@
     if (request->has_param() && request->param().check_auth_context()) {
       CheckAuthContext(context);
     }
+    if (request->has_param() &&
+        request->param().response_message_length() > 0) {
+      response->set_message(
+          grpc::string(request->param().response_message_length(), '\0'));
+    }
     return Status::OK;
   }
 
@@ -786,6 +791,21 @@
   CheckAuthContext(&context);
 }
 
+// Make the response larger than the flow control window.
+TEST_F(End2endTest, HugeResponse) {
+  ResetStub();
+  EchoRequest request;
+  EchoResponse response;
+  request.set_message("huge response");
+  const int kResponseSize = 1024 * (1024 + 10);
+  request.mutable_param()->set_response_message_length(kResponseSize);
+
+  ClientContext context;
+  Status s = stub_->Echo(&context, request, &response);
+  EXPECT_EQ(kResponseSize, response.message().size());
+  EXPECT_TRUE(s.ok());
+}
+
 }  // namespace testing
 }  // namespace grpc
 

test/cpp/util/messages.proto

diff --git a/test/cpp/util/messages.proto b/test/cpp/util/messages.proto
index 3708972..2fad8b4 100644
--- a/test/cpp/util/messages.proto
+++ b/test/cpp/util/messages.proto
@@ -38,6 +38,7 @@
   optional int32 server_cancel_after_us = 3;
   optional bool echo_metadata = 4;
   optional bool check_auth_context = 5;
+  optional int32 response_message_length = 6;
 }
 
 message EchoRequest {