git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa9136a fab6027)
Merge branch 'ew/daemon-socket-keepalive' into maint
authorJunio C Hamano <redacted>
Mon, 8 Aug 2016 21:21:37 +0000 (14:21 -0700)
committerJunio C Hamano <redacted>
Mon, 8 Aug 2016 21:21:37 +0000 (14:21 -0700)
commit172b811322e30ecb3cd660319890e41bc40006bc
tree69c96d5ea70cc4d53dbecee794cb8a09dfad449ftree | snapshot
parentaa9136a87e3ce299fe966da4686a571d6a528311commit | diff
parentfab60274800efba101b3f08a297639d14ecbf840commit | diff
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
compat/mingw.h diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT