From: Junio C Hamano Date: Thu, 28 Jul 2016 17:34:43 +0000 (-0700) Subject: Merge branch 'ew/daemon-socket-keepalive' X-Git-Tag: v2.10.0-rc0~76 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b48dfd86c90cae3f98dca01101b7e298c0192d16 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 --- b48dfd86c90cae3f98dca01101b7e298c0192d16