diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-28 14:11:49 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-28 14:11:49 -0700 |
| commit | f6cb0c0f06992ba8d14584f10da439899cb9432e (patch) | |
| tree | faeed8bf5ce71f3df9f590a9ba725293f6f8ac57 | |
| parent | b6090a697b6559155ef8ac80d4343204183571d7 (diff) | |
mergemergemerge
| -rw-r--r-- | src/core/ext/client_channel/client_channel.c | 2 | ||||
| -rw-r--r-- | src/core/lib/channel/http_server_filter.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/client_channel/client_channel.c b/src/core/ext/client_channel/client_channel.c index b6dc50544b..6e3b472527 100644 --- a/src/core/ext/client_channel/client_channel.c +++ b/src/core/ext/client_channel/client_channel.c @@ -1185,7 +1185,7 @@ static void start_transport_stream_op_locked(grpc_exec_ctx *exec_ctx, void *arg, grpc_call_element *elem = op->handler_private.extra_arg; call_data *calld = elem->call_data; - if (op->recv_trailing_metadata != NULL) { + if (op->recv_trailing_metadata) { GPR_ASSERT(op->on_complete != NULL); calld->original_on_complete = op->on_complete; grpc_closure_init(&calld->on_complete, on_complete, elem, diff --git a/src/core/lib/channel/http_server_filter.c b/src/core/lib/channel/http_server_filter.c index ac4cdcfa97..4217d93645 100644 --- a/src/core/lib/channel/http_server_filter.c +++ b/src/core/lib/channel/http_server_filter.c @@ -212,7 +212,8 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, grpc_error_set_str( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing header"), GRPC_ERROR_STR_KEY, grpc_slice_from_static_string(":path"))); - } else if (*calld->recv_cacheable_request == true) { + } else if (*calld->recv_initial_metadata_flags & + GRPC_INITIAL_METADATA_CACHEABLE_REQUEST) { /* We have a cacheable request made with GET verb. The path contains the * query parameter which is base64 encoded request payload. */ const char k_query_separator = '?'; |