diff options
| author |  Mark D. Roth <roth@google.com> | 2017-12-04 14:28:49 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-04 14:28:49 -0800 |
| commit | 6fa206de8f8a1444fff19a84945a424c0cabb41c (patch) | |
| tree | 9e80ef6bcdb78485d23a0e72dfae4fc4190b9e79 /include | |
| parent | f3b73e524fd4c834a3d14140e46d28aa67e035e2 (diff) | |
| parent | 2c619be9827cc800fad9461b7b86f77af866cfbe (diff) | |
Merge pull request #13336 from markdroth/server_connection_timeout
On server, include receiving HTTP/2 settings in handshake timeout
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 ad668b4f11..77844aa2af 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 |