diff options
| author |  David G. Quintas <dgq@google.com> | 2016-11-14 13:24:09 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-11-14 13:24:09 -0800 |
| commit | 7d46b94bb54c23db3132d9bdf6b572899c04ac85 (patch) | |
| tree | ccce51220ce74ea158ca701ad46c851bacb54e01 | |
| parent | d0670ae60bf3398b426834019df66709584d28c6 (diff) | |
| parent | ed2f308554c11859e4f0e77ed2e98f0814e609e4 (diff) | |
Merge pull request #8724 from dgquintas/chttp_initial_md_copypaste_fix
Fixed wrong NULLing in chttp2 transport
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index fb8fbae0ab..127e1cdc13 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1037,7 +1037,7 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op, "op.send_initial_metadata"); } } else { - s->send_trailing_metadata = NULL; + s->send_initial_metadata = NULL; grpc_chttp2_complete_closure_step( exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_CREATE( @@ -1523,13 +1523,17 @@ static void fail_pending_writes(grpc_exec_ctx *exec_ctx, grpc_error *error) { error = removal_error(error, s, "Pending writes failed due to stream closure"); - s->fetching_send_message = NULL; + s->send_initial_metadata = NULL; grpc_chttp2_complete_closure_step( exec_ctx, t, s, &s->send_initial_metadata_finished, GRPC_ERROR_REF(error), "send_initial_metadata_finished"); + + s->send_trailing_metadata = NULL; grpc_chttp2_complete_closure_step( exec_ctx, t, s, &s->send_trailing_metadata_finished, GRPC_ERROR_REF(error), "send_trailing_metadata_finished"); + + s->fetching_send_message = NULL; grpc_chttp2_complete_closure_step( exec_ctx, t, s, &s->fetching_send_message_finished, GRPC_ERROR_REF(error), "fetching_send_message_finished"); |