From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:37 +0000 (-0700)
Subject: Merge branch 'ew/daemon-socket-keepalive' into maint
X-Git-Tag: v2.9.3~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=172b811322e30ecb3cd660319890e41bc40006bc;p=thirdparty%2Fgit.git

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
---

172b811322e30ecb3cd660319890e41bc40006bc