aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc/impl
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2018-09-12 17:10:09 -0700
committerGravatar Yash Tibrewal <yashkt@google.com>2018-09-12 17:10:09 -0700
commit18a6a012f2abe06bb90ecffc3fb9d46eb30e1f86 (patch)
treec653d07d4d8158ed651fcca6e5e3c36a973934a3 /include/grpc/impl
parent86530acca735b6ba49dee12bfc7e80d86d49c0cb (diff)
parent20345b21bb00c626ef346c26dbb3903c96c21c52 (diff)
Merge branch 'master' into linuxversion
Diffstat (limited to 'include/grpc/impl')
-rw-r--r--include/grpc/impl/codegen/grpc_types.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index b5353c1dea..5f3b96f40b 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -342,6 +342,9 @@ typedef struct {
"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"
+/** If set to non zero, surfaces the user agent string to the server. User
+ agent is surfaced by default. */
+#define GRPC_ARG_SURFACE_USER_AGENT "grpc.surface_user_agent"
/** \} */
/** Result of a grpc call. If the caller satisfies the prerequisites of a