diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:43 -0700 |
| commit | b48dfd86c90cae3f98dca01101b7e298c0192d16 (patch) | |
| tree | 4e2ab2b9811d0fc44449153e0034ae8897a80797 | |
| parent | Merge branch 'nd/pack-ofs-4gb-limit' (diff) | |
| parent | Windows: add missing definition of ENOTSOCK (diff) | |
| download | tgif-b48dfd86c90cae3f98dca01101b7e298c0192d16.tar.xz | |
Merge branch 'ew/daemon-socket-keepalive'
Recent update to "git daemon" tries to enable the socket-level
KEEPALIVE, but when it is spawned via inetd, the standard input
file descriptor may not necessarily be connected to a socket.
Suppress an ENOTSOCK error from setsockopt().
* ew/daemon-socket-keepalive:
Windows: add missing definition of ENOTSOCK
daemon: ignore ENOTSOCK from setsockopt
| -rw-r--r-- | compat/mingw.h | 3 | ||||
| -rw-r--r-- | daemon.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 233933ee86..95e128fcfd 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -73,6 +73,9 @@ typedef int pid_t; #ifndef ECONNABORTED #define ECONNABORTED WSAECONNABORTED #endif +#ifndef ENOTSOCK +#define ENOTSOCK WSAENOTSOCK +#endif struct passwd { char *pw_name; @@ -672,9 +672,11 @@ static void set_keep_alive(int sockfd) { int ka = 1; - if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) - logerror("unable to set SO_KEEPALIVE on socket: %s", - strerror(errno)); + if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) { + if (errno != ENOTSOCK) + logerror("unable to set SO_KEEPALIVE on socket: %s", + strerror(errno)); + } } static int execute(void) |