From e273b033da3f374fe82db0644d9455f890bbb296 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 22 Jul 2016 13:24:21 -0700 Subject: Plumb server name down into the subchannel. --- src/core/ext/transport/chttp2/client/insecure/channel_create.c | 3 ++- src/core/ext/transport/chttp2/client/secure/secure_channel_create.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/core/ext/transport/chttp2/client') diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.c b/src/core/ext/transport/chttp2/client/insecure/channel_create.c index 800ef59de0..2df4ce1dda 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.c +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c @@ -191,7 +191,8 @@ static grpc_subchannel *client_channel_factory_create_subchannel( char *proxy_server = grpc_get_http_connect_proxy_server_from_args(final_args); if (proxy_server != NULL) { grpc_handshake_manager_add( - grpc_http_connect_handshaker_create(proxy_server), c->handshake_mgr); + grpc_http_connect_handshaker_create(proxy_server, args->server_name), + c->handshake_mgr); } args->args = final_args; s = grpc_subchannel_create(exec_ctx, &c->base, args); diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c index 9feae8e409..ee8f39434b 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c @@ -260,7 +260,8 @@ static grpc_subchannel *client_channel_factory_create_subchannel( char *proxy_server = grpc_get_http_connect_proxy_server_from_args(final_args); if (proxy_server != NULL) { grpc_handshake_manager_add( - grpc_http_connect_handshaker_create(proxy_server), c->handshake_mgr); + grpc_http_connect_handshaker_create(proxy_server, args->server_name), + c->handshake_mgr); } gpr_mu_init(&c->mu); gpr_ref_init(&c->refs, 1); -- cgit v1.2.3