Merge branch 'flow' into trickle_stall

8 years ago · addd3339e2
parent 24e9fe7b92 cb1d47ec12
commit addd3339e2
1 changed files with 1 additions and 1 deletions
--- a/src/core/ext/transport/chttp2/transport/writing.c
+++ b/src/core/ext/transport/chttp2/transport/writing.c
@ -161,7 +161,7 @@ static bool stream_ref_if_not_destroyed(gpr_refcount *r) {
 }

 uint32_t grpc_chttp2_target_incoming_window(grpc_chttp2_transport *t) {
-  return (uint32_t)GPR_MAX(
+  return (uint32_t)GPR_MIN(
      (int64_t)((1u << 31) - 1),
      t->stream_total_over_incoming_window +
          (int64_t)GPR_MAX(