diff options
author | 2015-02-11 18:19:24 -0800 | |
---|---|---|
committer | 2015-02-11 18:19:24 -0800 | |
commit | d9dd8fee0485ee3b3c2c5caa1df39b7c97330ac2 (patch) | |
tree | d4bcdc37bbed36b9cdce6d507292add4c72ab4d5 /src/core/surface | |
parent | bd217574fb7ec65f899103eb4e1f8719b83fa43a (diff) | |
parent | d8b88dec9182705356af8a862445c28c41ab35c8 (diff) |
Merge github.com:grpc/grpc into c++api
Diffstat (limited to 'src/core/surface')
-rw-r--r-- | src/core/surface/secure_channel_create.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index defee79766..562e27ff6d 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -189,8 +189,8 @@ static void done_setup(void *sp) { static grpc_transport_setup_result complete_setup(void *channel_stack, grpc_transport *transport, grpc_mdctx *mdctx) { - static grpc_channel_filter const *extra_filters[] = {&grpc_http_client_filter, - &grpc_http_filter}; + static grpc_channel_filter const *extra_filters[] = { + &grpc_client_auth_filter, &grpc_http_client_filter, &grpc_http_filter}; return grpc_client_channel_transport_setup_complete( channel_stack, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx); @@ -208,7 +208,7 @@ grpc_channel *grpc_secure_channel_create_internal( grpc_arg context_arg; grpc_channel_args *args_copy; grpc_mdctx *mdctx = grpc_mdctx_create(); -#define MAX_FILTERS 4 +#define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; int n = 0; if (grpc_find_security_context_in_args(args) != NULL) { @@ -222,7 +222,6 @@ grpc_channel *grpc_secure_channel_create_internal( if (grpc_channel_args_is_census_enabled(args)) { filters[n++] = &grpc_client_census_filter; } - filters[n++] = &grpc_client_auth_filter; filters[n++] = &grpc_client_channel_filter; GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(filters, n, args_copy, mdctx, 1); |