diff options
author | Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-02-07 10:23:36 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 10:23:36 -0800 |
commit | 890e386d89d455e6ecbbff58f251bef4eaa3b438 (patch) | |
tree | d2c62a8ebe9982da951f25a2c6ec92372cff66e9 /src/core/lib | |
parent | fb369d95677b85995071e8255230c8bd7e291216 (diff) | |
parent | b9335ebe471f50ff16a9be6f56e6a83e35bca38c (diff) |
Merge pull request #14348 from mehrdada/upmerge
Upmerge 1.9.x to master
Diffstat (limited to 'src/core/lib')
-rw-r--r-- | src/core/lib/security/transport/client_auth_filter.cc | 5 | ||||
-rw-r--r-- | src/core/lib/surface/call.cc | 1 | ||||
-rw-r--r-- | src/core/lib/surface/version.cc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 16814d2598..802503c868 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -118,6 +118,7 @@ static void on_credentials_metadata(void* arg, grpc_error* input_error) { grpc_transport_stream_op_batch_finish_with_failure(batch, error, calld->call_combiner); } + GRPC_CALL_STACK_UNREF(calld->owning_call, "get_request_metadata"); } void grpc_auth_metadata_context_build( @@ -208,7 +209,7 @@ static void send_security_metadata(grpc_call_element* elem, chand->auth_context, &calld->auth_md_context); GPR_ASSERT(calld->pollent != nullptr); - + GRPC_CALL_STACK_REF(calld->owning_call, "get_request_metadata"); GRPC_CLOSURE_INIT(&calld->async_result_closure, on_credentials_metadata, batch, grpc_schedule_on_exec_ctx); grpc_error* error = GRPC_ERROR_NONE; @@ -250,6 +251,7 @@ static void on_host_checked(void* arg, grpc_error* error) { calld->call_combiner); gpr_free(error_msg); } + GRPC_CALL_STACK_UNREF(calld->owning_call, "check_call_host"); } static void cancel_check_call_host(void* arg, grpc_error* error) { @@ -312,6 +314,7 @@ static void auth_start_transport_stream_op_batch( } if (calld->have_host) { batch->handler_private.extra_arg = elem; + GRPC_CALL_STACK_REF(calld->owning_call, "check_call_host"); GRPC_CLOSURE_INIT(&calld->async_result_closure, on_host_checked, batch, grpc_schedule_on_exec_ctx); char* call_host = grpc_slice_to_c_string(calld->host); diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index f2096d8937..b538cc0212 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -1032,6 +1032,7 @@ static grpc_stream_compression_algorithm decode_stream_compression( static void publish_app_metadata(grpc_call* call, grpc_metadata_batch* b, int is_trailing) { if (b->list.count == 0) return; + if (is_trailing && call->buffered_metadata[1] == nullptr) return; GPR_TIMER_SCOPE("publish_app_metadata", 0); grpc_metadata_array* dest; grpc_metadata* mdusr; diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index 153b6e0297..51daad0368 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -23,4 +23,4 @@ const char* grpc_version_string(void) { return "6.0.0-dev"; } -const char* grpc_g_stands_for(void) { return "glossy"; } +const char* grpc_g_stands_for(void) { return "glamorous"; } |