]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ew/daemon-socket-keepalive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:43 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:43 +0000 (10:34 -0700)
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

1  2 
compat/mingw.h
daemon.c

diff --cc compat/mingw.h
Simple merge
diff --cc daemon.c
Simple merge