diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-01 14:22:55 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-01 14:22:55 -0700 |
| commit | fb475c93c4ee71998f63cefdb1846e3e6aa8f3a2 (patch) | |
| tree | 15a90a89d829a7be7964dcd599316a2bd8ae05fa /src/core/lib/surface | |
| parent | 555cf763a3f939639e03ef9e1f2a67bc5dfe2a19 (diff) | |
| parent | 79620aaa1052fd02539a36caa63cbe24a2087b0f (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c index 64afcecc07..55e6d99057 100644 --- a/src/core/lib/surface/server.c +++ b/src/core/lib/surface/server.c @@ -149,6 +149,7 @@ struct call_data { grpc_metadata_batch *recv_initial_metadata; bool recv_idempotent_request; + bool recv_cacheable_request; grpc_metadata_array initial_metadata; request_matcher *request_matcher; @@ -497,9 +498,12 @@ static void publish_call(grpc_exec_ctx *exec_ctx, grpc_server *server, &rc->data.batch.details->method_capacity, calld->path); rc->data.batch.details->deadline = calld->deadline; rc->data.batch.details->flags = - 0 | (calld->recv_idempotent_request - ? GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST - : 0); + (calld->recv_idempotent_request + ? GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST + : 0) | + (calld->recv_cacheable_request + ? GRPC_INITIAL_METADATA_CACHEABLE_REQUEST + : 0); break; case REGISTERED_CALL: *rc->data.registered.deadline = calld->deadline; @@ -779,6 +783,7 @@ static void server_mutate_op(grpc_call_element *elem, calld->on_done_recv_initial_metadata = op->recv_initial_metadata_ready; op->recv_initial_metadata_ready = &calld->server_on_recv_initial_metadata; op->recv_idempotent_request = &calld->recv_idempotent_request; + op->recv_cacheable_request = &calld->recv_cacheable_request; } } |