summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:43 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-28 10:34:43 -0700
commitb48dfd86c90cae3f98dca01101b7e298c0192d16 (patch)
tree4e2ab2b9811d0fc44449153e0034ae8897a80797 /daemon.c
parentad2d77760434e1650c186c71fa04a8fdbd77266c (diff)
parentfab60274800efba101b3f08a297639d14ecbf840 (diff)
downloadgit-b48dfd86c90cae3f98dca01101b7e298c0192d16.tar.gz
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
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/daemon.c b/daemon.c
index e647254c19..425aad0507 100644
--- a/daemon.c
+++ b/daemon.c
@@ -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)