diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:21:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:21:37 +0200 |
| commit | 172b811322e30ecb3cd660319890e41bc40006bc (patch) | |
| tree | 69c96d5ea70cc4d53dbecee794cb8a09dfad449f | |
| parent | Merge branch 'nd/pack-ofs-4gb-limit' into maint (diff) | |
| parent | Windows: add missing definition of ENOTSOCK (diff) | |
| download | git-172b811322e30ecb3cd660319890e41bc40006bc.tar.xz git-172b811322e30ecb3cd660319890e41bc40006bc.zip | |
Merge branch 'ew/daemon-socket-keepalive' into maint
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 9a8803b876..ef22cbb05d 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; @@ -673,9 +673,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) |