]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitb48dfd86c90cae3f98dca01101b7e298c0192d16
tree4e2ab2b9811d0fc44449153e0034ae8897a80797
parentad2d77760434e1650c186c71fa04a8fdbd77266c
parentfab60274800efba101b3f08a297639d14ecbf840
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
compat/mingw.h
daemon.c