diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-19 15:19:00 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-19 15:19:00 -0700 |
| commit | 10edf68eec9ec2d5520cb2cb88010090257ea946 (patch) | |
| tree | 86f985cea32f234371c6f4b868312e2186b4d569 /src/core/lib/surface | |
| parent | b7a83818f8dc3d8f01a62613471951446fff87c6 (diff) | |
| parent | 70ee74c4798afe781788d40afe1923feff37d657 (diff) | |
Merge branch 'master' into uv_core_transport
Diffstat (limited to 'src/core/lib/surface')
| -rw-r--r-- | src/core/lib/surface/call.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index dd5b1079af..02a5de0857 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -242,11 +242,15 @@ grpc_error *grpc_call_create(const grpc_call_create_args *args, /* Always support no compression */ GPR_BITSET(&call->encodings_accepted_by_peer, GRPC_COMPRESS_NONE); call->is_client = args->server_transport_data == NULL; + grpc_mdstr *path = NULL; if (call->is_client) { GPR_ASSERT(args->add_initial_metadata_count < MAX_SEND_EXTRA_METADATA_COUNT); for (i = 0; i < args->add_initial_metadata_count; i++) { call->send_extra_metadata[i].md = args->add_initial_metadata[i]; + if (args->add_initial_metadata[i]->key == GRPC_MDSTR_PATH) { + path = GRPC_MDSTR_REF(args->add_initial_metadata[i]->value); + } } call->send_extra_metadata_count = (int)args->add_initial_metadata_count; } else { @@ -307,9 +311,10 @@ grpc_error *grpc_call_create(const grpc_call_create_args *args, GRPC_CHANNEL_INTERNAL_REF(args->channel, "call"); /* initial refcount dropped by grpc_call_destroy */ - grpc_error *error = grpc_call_stack_init( - &exec_ctx, channel_stack, 1, destroy_call, call, call->context, - args->server_transport_data, send_deadline, CALL_STACK_FROM_CALL(call)); + grpc_error *error = + grpc_call_stack_init(&exec_ctx, channel_stack, 1, destroy_call, call, + call->context, args->server_transport_data, path, + send_deadline, CALL_STACK_FROM_CALL(call)); if (error != GRPC_ERROR_NONE) { grpc_status_code status; const char *error_str; @@ -333,6 +338,8 @@ grpc_error *grpc_call_create(const grpc_call_create_args *args, &exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); } + if (path != NULL) GRPC_MDSTR_UNREF(path); + grpc_exec_ctx_finish(&exec_ctx); GPR_TIMER_END("grpc_call_create", 0); return error; |