diff options
| author |  Noah Eisen <ncteisen@gmail.com> | 2017-11-09 10:38:10 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-09 10:38:10 -0800 |
| commit | 3a54b8673eed472679b11bb463cfcaf50ba6e282 (patch) | |
| tree | 506a12f9d85752a0b6a773e59d0f7906615d8fcd /src | |
| parent | e782063f2b5563e1bdb875bb627190caf8ff607b (diff) | |
| parent | a6746340550ef6504ce1ecbc86256a6e2af4f21e (diff) | |
Merge pull request #13201 from wjackson/cancel-and-priority
Fix header-with-priority for canceled stream bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/parsing.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 8a3774d688..6737c26e72 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -590,7 +590,11 @@ static grpc_error* init_header_frame_parser(grpc_exec_ctx* exec_ctx, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); } - return init_skip_frame_parser(exec_ctx, t, 1); + grpc_error* err = init_skip_frame_parser(exec_ctx, t, 1); + if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY) { + grpc_chttp2_hpack_parser_set_has_priority(&t->hpack_parser); + } + return err; } else if (t->last_new_stream_id >= t->incoming_stream_id) { GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, |