diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-09-13 15:16:02 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-09-13 15:16:02 -0700 |
| commit | 1819935efbb2fb014c0c29bc47f5045fbcf5c6cf (patch) | |
| tree | b59127474ac1b007a44d4209caadc27e7355a52a /src/core/lib/iomgr/tcp_server_utils_posix_common.cc | |
| parent | 30e7b02b5c8bc55c109ed84dfa30663ce90e134b (diff) | |
| parent | 07eecd8421314d62e8df33b14a33203864f91bee (diff) | |
Merge branch 'master' into statuscaution
Diffstat (limited to 'src/core/lib/iomgr/tcp_server_utils_posix_common.cc')
| -rw-r--r-- | src/core/lib/iomgr/tcp_server_utils_posix_common.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index 9595c028ce..8d8d3f4273 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -166,6 +166,9 @@ grpc_error* grpc_tcp_server_prepare_socket(grpc_tcp_server* s, int fd, if (err != GRPC_ERROR_NONE) goto error; err = grpc_set_socket_reuse_addr(fd, 1); if (err != GRPC_ERROR_NONE) goto error; + err = grpc_set_socket_tcp_user_timeout(fd, s->channel_args, + false /* is_client */); + if (err != GRPC_ERROR_NONE) goto error; } err = grpc_set_socket_no_sigpipe_if_possible(fd); if (err != GRPC_ERROR_NONE) goto error; |