undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ew/daemon-socket-keepalive'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2016-07-28 10:34:43 -07:00
commit b48dfd86c9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compat/mingw.h
View File

@ -73,6 +73,9 @@ typedef int pid_t;
#ifndef ECONNABORTED #ifndef ECONNABORTED
#define ECONNABORTED WSAECONNABORTED #define ECONNABORTED WSAECONNABORTED
#endif #endif
#ifndef ENOTSOCK
#define ENOTSOCK WSAENOTSOCK
#endif
struct passwd { struct passwd {
char *pw_name; char *pw_name;

8
daemon.c
View File

@ -672,9 +672,11 @@ static void set_keep_alive(int sockfd)
{ {
int ka = 1; int ka = 1;
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {
logerror("unable to set SO_KEEPALIVE on socket: %s", if (errno != ENOTSOCK)
strerror(errno)); logerror("unable to set SO_KEEPALIVE on socket: %s",
strerror(errno));
}
} }
static int execute(void) static int execute(void)