diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-21 08:02:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-21 08:02:06 -0700 |
| commit | def5aa89d193ef5a20dcdb8234af46ad4b240919 (patch) | |
| tree | 7345f0c60705df5d01cc0594ef42712771ce6538 /src/core | |
| parent | 89f8d4c4438f4f71bf81a29d685d8b28e8c686fc (diff) | |
| parent | 77a4c52cbf3706191640e117b1f9bccddd64f1ac (diff) | |
Merge github.com:grpc/grpc into epex4
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/filters/message_size/message_size_filter.c | 2 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/ext/filters/message_size/message_size_filter.c b/src/core/ext/filters/message_size/message_size_filter.c index db0f011905..e3ffc41f90 100644 --- a/src/core/ext/filters/message_size/message_size_filter.c +++ b/src/core/ext/filters/message_size/message_size_filter.c @@ -130,6 +130,8 @@ static void recv_message_ready(grpc_exec_ctx* exec_ctx, void* user_data, GRPC_ERROR_UNREF(new_error); } gpr_free(message_string); + } else { + GRPC_ERROR_REF(error); } // Invoke the next callback. grpc_closure_run(exec_ctx, calld->next_recv_message_ready, error); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index a4cee39104..5d74532ede 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -2603,6 +2603,7 @@ static bool incoming_byte_stream_next(grpc_exec_ctx *exec_ctx, (grpc_chttp2_incoming_byte_stream *)byte_stream; grpc_chttp2_stream *s = bs->stream; if (s->unprocessed_incoming_frames_buffer.length > 0) { + GPR_TIMER_END("incoming_byte_stream_next", 0); return true; } else { gpr_ref(&bs->refs); |