diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-12-05 17:49:11 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-12-05 17:49:11 -0800 |
| commit | 73bb67d054ecb952f10649cc42c998ab7ea8facd (patch) | |
| tree | 181ee31adc7a144d8dcffed5e5de990ab4662cef /include | |
| parent | 65c45fbb4d576d99bcd1c00a13f430c8994fee38 (diff) | |
| parent | 05cd3102b7b59bf5d71f66dc012be1f4ecdaad88 (diff) | |
Merge master into execctx
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 3 |
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 9ab2fc8b73..fcbc8ac5a1 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -240,6 +240,9 @@ typedef struct { /** The time between the first and second connection attempts, in ms */ #define GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS \ "grpc.initial_reconnect_backoff_ms" +/** The timeout used on servers for finishing handshaking on an incoming + connection. Defaults to 120 seconds. */ +#define GRPC_ARG_SERVER_HANDSHAKE_TIMEOUT_MS "grpc.server_handshake_timeout_ms" /** This *should* be used for testing only. The caller of the secure_channel_create functions may override the target name used for SSL host name checking using this channel argument which is of |