diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-03-17 13:02:03 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-03-17 16:00:17 -0700 |
| commit | 9bc0d8200ec17ababe4c9cd6134a2cb7465365a6 (patch) | |
| tree | 14ac57b2410205774b345de360b0886033d7d433 /src/core/ext/client_channel/http_proxy.c | |
| parent | cabb1517e5ac3cdbe59415678d4f0d284f9fabda (diff) | |
| parent | 40a947ef93aeddca3b606613f628d4d09f094e77 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'src/core/ext/client_channel/http_proxy.c')
| -rw-r--r-- | src/core/ext/client_channel/http_proxy.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/ext/client_channel/http_proxy.c b/src/core/ext/client_channel/http_proxy.c index bbe4ff550c..e280cef101 100644 --- a/src/core/ext/client_channel/http_proxy.c +++ b/src/core/ext/client_channel/http_proxy.c @@ -46,10 +46,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/support/env.h" -static char* grpc_get_http_proxy_server() { +static char* grpc_get_http_proxy_server(grpc_exec_ctx* exec_ctx) { char* uri_str = gpr_getenv("http_proxy"); if (uri_str == NULL) return NULL; - grpc_uri* uri = grpc_uri_parse(uri_str, false /* suppress_errors */); + grpc_uri* uri = + grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */); char* proxy_name = NULL; if (uri == NULL || uri->authority == NULL) { gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var"); @@ -76,9 +77,10 @@ static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, const grpc_channel_args* args, char** name_to_resolve, grpc_channel_args** new_args) { - *name_to_resolve = grpc_get_http_proxy_server(); + *name_to_resolve = grpc_get_http_proxy_server(exec_ctx); if (*name_to_resolve == NULL) return false; - grpc_uri* uri = grpc_uri_parse(server_uri, false /* suppress_errors */); + grpc_uri* uri = + grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */); if (uri == NULL || uri->path[0] == '\0') { gpr_log(GPR_ERROR, "'http_proxy' environment variable set, but cannot " |