diff options
author | 2015-06-01 08:48:45 -0700 | |
---|---|---|
committer | 2015-06-01 08:48:45 -0700 | |
commit | aaa03d74ceae4d48e31f4ba0619e359acd21505a (patch) | |
tree | 06677cfa5ddf1e7732d53cf550cd2ec1deadbc83 /src/core/surface/server.c | |
parent | c590f213c7a7d0b9b1692826050152130fa5709f (diff) | |
parent | ee066371bbc83e3fdc0dd069d191335c32b9b6db (diff) |
Merge github.com:grpc/grpc into you-complete-me
Diffstat (limited to 'src/core/surface/server.c')
-rw-r--r-- | src/core/surface/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 20985af44c..71b1dd0630 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -727,7 +727,7 @@ void grpc_server_start(grpc_server *server) { grpc_transport_setup_result grpc_server_setup_transport( grpc_server *s, grpc_transport *transport, grpc_channel_filter const **extra_filters, size_t num_extra_filters, - grpc_mdctx *mdctx) { + grpc_mdctx *mdctx, const grpc_channel_args *args) { size_t num_filters = s->channel_filter_count + num_extra_filters + 1; grpc_channel_filter const **filters = gpr_malloc(sizeof(grpc_channel_filter *) * num_filters); @@ -758,8 +758,8 @@ grpc_transport_setup_result grpc_server_setup_transport( grpc_transport_add_to_pollset(transport, grpc_cq_pollset(s->cqs[i])); } - channel = grpc_channel_create_from_filters(filters, num_filters, - s->channel_args, mdctx, 0); + channel = + grpc_channel_create_from_filters(filters, num_filters, args, mdctx, 0); chand = (channel_data *)grpc_channel_stack_element( grpc_channel_get_channel_stack(channel), 0) ->channel_data; |