diff options
| author |  Abhishek Kumar <abhikumar@google.com> | 2015-04-29 11:16:38 -0700 |
|---|---|---|
| committer | Abhishek Kumar <abhikumar@google.com> | 2015-04-29 11:16:38 -0700 |
| commit | d7ec8a3dd0ad389a37ce0dd7ed140483785b293b (patch) | |
| tree | d950eafaa380dccbdfed70c0ac985328116cacbf /src/core/surface/secure_channel_create.c | |
| parent | 44347960733562f938b8e51e1c1a0ba90335dea3 (diff) | |
| parent | 1d73b7bffd8f4036a782689ccb3a255953af9f4c (diff) | |
Merge pull request #1369 from ctiller/one-pass
Unify transport & channel op interfaces
Diffstat (limited to 'src/core/surface/secure_channel_create.c')
| -rw-r--r-- | src/core/surface/secure_channel_create.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index e7d223bfda..3e331293b5 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -44,7 +44,6 @@ #include "src/core/channel/client_setup.h" #include "src/core/channel/connected_channel.h" #include "src/core/channel/http_client_filter.h" -#include "src/core/channel/http_filter.h" #include "src/core/iomgr/resolve_address.h" #include "src/core/iomgr/tcp_client.h" #include "src/core/security/auth.h" @@ -193,7 +192,7 @@ static grpc_transport_setup_result complete_setup(void *channel_stack, grpc_transport *transport, grpc_mdctx *mdctx) { static grpc_channel_filter const *extra_filters[] = { - &grpc_client_auth_filter, &grpc_http_client_filter, &grpc_http_filter}; + &grpc_client_auth_filter, &grpc_http_client_filter}; return grpc_client_channel_transport_setup_complete( channel_stack, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx); @@ -211,7 +210,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_arg connector_arg; grpc_channel_args *args_copy; grpc_channel_args *new_args_from_connector; - grpc_channel_security_connector* connector; + grpc_channel_security_connector *connector; grpc_mdctx *mdctx; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; |