From 3d906a05e6ada54e6539f71e779247fa603084d0 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Tue, 19 May 2020 16:09:26 -0700 Subject: [PATCH] Don't use send_initial_metadata payload unless this batch has it --- src/core/ext/filters/http/client_authority_filter.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index fd71c2fd845..2c3cae6adbc 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -53,13 +53,13 @@ void client_authority_start_transport_stream_op_batch( channel_data* chand = static_cast(elem->channel_data); call_data* calld = static_cast(elem->call_data); // Handle send_initial_metadata. - auto* initial_metadata = - batch->payload->send_initial_metadata.send_initial_metadata; // If the initial metadata doesn't already contain :authority, add it. if (batch->send_initial_metadata && - initial_metadata->idx.named.authority == nullptr) { + batch->payload->send_initial_metadata.send_initial_metadata->idx.named + .authority == nullptr) { grpc_error* error = grpc_metadata_batch_add_head( - initial_metadata, &calld->authority_storage, + batch->payload->send_initial_metadata.send_initial_metadata, + &calld->authority_storage, GRPC_MDELEM_REF(chand->default_authority_mdelem), GRPC_BATCH_AUTHORITY); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure(batch, error,