aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext
diff options
context:
space:
mode:
authorGravatar Noah Eisen <ncteisen@gmail.com>2017-01-12 08:00:30 -0800
committerGravatar GitHub <noreply@github.com>2017-01-12 08:00:30 -0800
commita5faf9968cdcb0a991b3af0f3d13e13fadd416bb (patch)
treeabf3d31fdbdd0cf9ae9051804a4b0432d2585f0e /src/core/ext
parent36c799b37a36c621109286109359f977bb6bfa51 (diff)
parent1a75c546d071d0a3f63642dc219a450dbd751e15 (diff)
Merge pull request #9149 from ncteisen/rst_stream_error_code_fix
Fix RST_STREAM(0) inconsistency
Diffstat (limited to 'src/core/ext')
-rw-r--r--src/core/ext/transport/chttp2/transport/frame_rst_stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.c b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c
index b4c5ed769b..20043f5fbf 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.c
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c
@@ -109,7 +109,7 @@ grpc_error *grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx *exec_ctx,
(((uint32_t)p->reason_bytes[2]) << 8) |
(((uint32_t)p->reason_bytes[3]));
grpc_error *error = GRPC_ERROR_NONE;
- if (reason != GRPC_CHTTP2_NO_ERROR) {
+ if (reason != GRPC_CHTTP2_NO_ERROR || s->header_frames_received < 2) {
error = grpc_error_set_int(GRPC_ERROR_CREATE("RST_STREAM"),
GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)reason);
grpc_status_code status_code = grpc_chttp2_http2_error_to_grpc_status(