diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-18 09:54:51 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-10-18 09:54:51 -0700 |
| commit | 50d6f7b60faf25678b33561b0348a4dd75fe97b0 (patch) | |
| tree | 3699d952bc7697b8dc68385a01a2c0c8fd5c38f2 /src/core/ext/transport/chttp2 | |
| parent | 20afa3d7c933207c548ed11928c47b552b5b2f80 (diff) | |
| parent | 1a62ec83b7af9c4437164d10fa23197c64542382 (diff) | |
Merge github.com:grpc/grpc into buffer_pools_for_realsies
Diffstat (limited to 'src/core/ext/transport/chttp2')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index 612852cb16..b2fdf88a87 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1447,6 +1447,7 @@ void grpc_chttp2_cancel_stream(grpc_exec_ctx *exec_ctx, } if (due_to_error != GRPC_ERROR_NONE && !s->seen_error) { s->seen_error = true; + grpc_chttp2_maybe_complete_recv_trailing_metadata(exec_ctx, t, s); } grpc_chttp2_mark_stream_closed(exec_ctx, t, s, 1, 1, due_to_error); } |