Code review changes.

pull/9383/head
Mark D. Roth 8 years ago
parent 45ccec5cee
commit 1cae131711
  1. 2
      src/core/ext/client_channel/client_channel.c
  2. 3
      src/core/ext/client_channel/http_connect_handshaker.h

@ -316,7 +316,7 @@ static void on_resolver_result_changed(grpc_exec_ctx *exec_ctx, void *arg,
// Use pick_first if nothing was specified and we didn't select grpclb // Use pick_first if nothing was specified and we didn't select grpclb
// above. // above.
if (lb_policy_name == NULL) lb_policy_name = "pick_first"; if (lb_policy_name == NULL) lb_policy_name = "pick_first";
// If using a proxy, add channel arg for HTTP CONNECT server. // If using a proxy, add channel arg for server in HTTP CONNECT request.
if (chand->proxy_name != NULL) { if (chand->proxy_name != NULL) {
grpc_arg new_arg; grpc_arg new_arg;
new_arg.key = GRPC_ARG_HTTP_CONNECT_SERVER; new_arg.key = GRPC_ARG_HTTP_CONNECT_SERVER;

@ -34,7 +34,8 @@
#ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
#define GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H #define GRPC_CORE_EXT_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
/// Channel arg indicating HTTP CONNECT server (string). /// Channel arg indicating the server in HTTP CONNECT request (string).
/// The presence of this arg triggers the use of HTTP CONNECT.
#define GRPC_ARG_HTTP_CONNECT_SERVER "grpc.http_connect_server" #define GRPC_ARG_HTTP_CONNECT_SERVER "grpc.http_connect_server"
/// Channel arg indicating HTTP CONNECT headers (string). /// Channel arg indicating HTTP CONNECT headers (string).

Loading…
Cancel
Save