diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-16 13:34:29 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-16 13:34:29 -0700 |
| commit | c627664511661072ea96c6f1454adb716b49ce9b (patch) | |
| tree | 7e0fa8f67b5014dae5b0329f4008b60e72bfc25f /src | |
| parent | 2ccd502ed4e3fffa2cccf7d3e0aa7103caf37bf0 (diff) | |
| parent | 597f51c01a576f79b323dc28a1b560f7c3b7a876 (diff) | |
Merge github.com:grpc/grpc into call_arena
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/transport/cronet/transport/cronet_transport.c | 2 | ||||
| -rw-r--r-- | src/core/lib/surface/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.c b/src/core/ext/transport/cronet/transport/cronet_transport.c index 384a99f979..450d9ab23a 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.c +++ b/src/core/ext/transport/cronet/transport/cronet_transport.c @@ -273,7 +273,7 @@ static void maybe_flush_read(stream_obj *s) { /* Whenever the evaluation of any of the two condition is changed, we check * whether we should enter the flush read state. */ if (s->state.pending_recv_trailing_metadata && s->state.fail_state) { - if (!s->state.flush_read) { + if (!s->state.flush_read && !s->state.rs.read_stream_closed) { CRONET_LOG(GPR_DEBUG, "%p: Flush read", s); s->state.flush_read = true; null_and_maybe_free_read_buffer(s); diff --git a/src/core/lib/surface/version.c b/src/core/lib/surface/version.c index 1143a9e044..ba80bd801e 100644 --- a/src/core/lib/surface/version.c +++ b/src/core/lib/surface/version.c @@ -38,4 +38,4 @@ const char *grpc_version_string(void) { return "3.0.0-dev"; } -const char *grpc_g_stands_for(void) { return "green"; } +const char *grpc_g_stands_for(void) { return "gentle"; } |