aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-12-16 19:35:00 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-12-16 19:35:00 -0800
commit50788ac987e4351e3012673dcb2c1da52758ce7d (patch)
tree6ea93efc0489e95d9dac3e9598cd1956804c9cd6 /src
parentce46c27b7478258da00d11dd81a31717b570d41a (diff)
parente81ada40ce6d29333b3b1ba26c34a549f8db5c79 (diff)
Merge branch 'big_data' of github.com:ctiller/grpc into big_data
Diffstat (limited to 'src')
-rw-r--r--src/core/transport/chttp2_transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c
index 3f21d84aa7..fd6fbe1c21 100644
--- a/src/core/transport/chttp2_transport.c
+++ b/src/core/transport/chttp2_transport.c
@@ -872,8 +872,8 @@ static void perform_stream_op_locked(
GPR_ASSERT(stream_global->recv_message_ready == NULL);
stream_global->recv_message_ready = op->recv_message_ready;
stream_global->recv_message = op->recv_message;
- if (stream_global->incoming_frames.head != NULL) {
- incoming_byte_stream_update_flow_control(transport_global, stream_global, 5, 0);
+ if (stream_global->incoming_frames.head == NULL || stream_global->incoming_frames.head->is_tail) {
+ incoming_byte_stream_update_flow_control(transport_global, stream_global, transport_global->stream_lookahead, 0);
}
grpc_chttp2_list_add_check_read_ops(transport_global, stream_global);
}