diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-13 23:00:07 -0700 |
| commit | f92460e539405bbca98af3547edd3150d0fcca40 (patch) | |
| tree | dea35a54d1f6db8135df398c6e5a328ba3489609 /include/grpc/impl | |
| parent | 19ac7c0baf298be51c0dbfa7d5bcd1f45eec7c78 (diff) | |
| parent | 9a2c0a8641d1837185a60436adf9419209f89fbe (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'include/grpc/impl')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 4 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 022be5fec4..a5961857c1 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -332,10 +332,12 @@ typedef struct { #define GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE "grpc.per_rpc_retry_buffer_size" /** Channel arg that carries the bridged objective c object for custom metrics * logging filter. */ -#define GRPC_ARG_MOBILE_LOG_CONFIG "grpc.mobile_log_config" +#define GRPC_ARG_MOBILE_LOG_CONTEXT "grpc.mobile_log_context" /** If non-zero, client authority filter is disabled for the channel */ #define GRPC_ARG_DISABLE_CLIENT_AUTHORITY_FILTER \ "grpc.disable_client_authority_filter" +/** If set to zero, disables use of http proxies. Enabled by default. */ +#define GRPC_ARG_ENABLE_HTTP_PROXY "grpc.enable_http_proxy" /** \} */ /** Result of a grpc call. If the caller satisfies the prerequisites of a diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index bf1bf3df6a..01ce5f03e9 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -227,7 +227,10 @@ #define GPR_POSIX_SYNC 1 #define GPR_POSIX_TIME 1 #define GPR_GETPID_IN_UNISTD_H 1 +/* TODO(mxyan): Remove when CFStream becomes default */ +#ifndef GRPC_CFSTREAM #define GPR_SUPPORT_CHANNELS_FROM_FD 1 +#endif #ifdef _LP64 #define GPR_ARCH_64 1 #else /* _LP64 */ |