diff options
| author |  David G. Quintas <dgq@google.com> | 2015-07-01 16:05:05 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2015-07-01 16:05:05 -0700 |
| commit | ef558b321f4f65f37d5579648d5ff606128b60e0 (patch) | |
| tree | 7812e32af1b78050938c36749bf4b8e5a47f960a /src | |
| parent | a840de4321ab20b320780ba1a42a2c568c3ddc3c (diff) | |
| parent | 0e640a8cb22634b51a2e7e0d193449341ac92663 (diff) | |
Merge pull request #2284 from ctiller/oops-i-split-it-again
Remove errant assert
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/transport/chttp2/parsing.c | 3 | ||||
| -rw-r--r-- | src/core/transport/chttp2_transport.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 8f682e9017..4664a0895c 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -109,9 +109,6 @@ void grpc_chttp2_publish_reads( transport_parsing->incoming_stream_id; } - /* TODO(ctiller): re-implement */ - GPR_ASSERT(transport_parsing->initial_window_update == 0); - /* copy parsing qbuf to global qbuf */ gpr_slice_buffer_move_into(&transport_parsing->qbuf, &transport_global->qbuf); diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index 934a2e6f10..7ecc49ed60 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -914,6 +914,7 @@ static void recv_data(void *tp, gpr_slice *slices, size_t nslices, if (t->parsing.initial_window_update != 0) { grpc_chttp2_stream_map_for_each(&t->parsing_stream_map, update_global_window, t); + t->parsing.initial_window_update = 0; } /* handle higher level things */ grpc_chttp2_publish_reads(&t->global, &t->parsing); |