aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-04-12 13:57:06 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-04-12 13:57:06 -0700
commitba926469e76c583a4f8b3eb22a342b69323fb921 (patch)
tree26c1848db4547156760538ebe61b21beba9ed9f2 /src
parent666a362a669924cd081d3c3a63e0818535e5c91f (diff)
parentbf359b75dbf00de25c2939583efcab8db7778bfa (diff)
Merge github.com:grpc/grpc into strong-includes
Diffstat (limited to 'src')
-rw-r--r--src/core/ext/transport/chttp2/transport/chttp2_transport.c4
1 files changed, 4 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 b4cd185e62..01507f5ca6 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c
@@ -1159,6 +1159,10 @@ static void cancel_from_api(grpc_exec_ctx *exec_ctx,
grpc_chttp2_fake_status(exec_ctx, transport_global, stream_global, status,
NULL);
}
+ if (status != GRPC_STATUS_OK && !stream_global->seen_error) {
+ stream_global->seen_error = 1;
+ grpc_chttp2_list_add_check_read_ops(transport_global, stream_global);
+ }
grpc_chttp2_mark_stream_closed(exec_ctx, transport_global, stream_global, 1,
1);
}