Merge branch 'ew/daemon-socket-keepalive'

gitster · gitster · commit b48dfd86c90c · 2016-07-28T10:34:43.000-07:00
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
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -73,6 +73,9 @@ typedef int pid_t;
 #ifndef ECONNABORTED
 #define ECONNABORTED WSAECONNABORTED
 #endif
+#ifndef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#endif
 
 struct passwd {
 	char *pw_name;
diff --git a/daemon.c b/daemon.c
@@ -672,9 +672,11 @@ static void set_keep_alive(int sockfd)
 {
 	int ka = 1;
 
-	if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
-		logerror("unable to set SO_KEEPALIVE on socket: %s",
-			strerror(errno));
+	if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {
+		if (errno != ENOTSOCK)
+			logerror("unable to set SO_KEEPALIVE on socket: %s",
+				strerror(errno));
+	}
 }
 
 static int execute(void)

Original file line number	Diff line number	Diff line change
`@@ -672,9 +672,11 @@ static void set_keep_alive(int sockfd)`
`672`	`672`	`{`
`673`	`673`	`int ka = 1;`
`674`	`674`
`675`		`- if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)`
`676`		`- logerror("unable to set SO_KEEPALIVE on socket: %s",`
`677`		`- strerror(errno));`
	`675`	`+ if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) {`
	`676`	`+ if (errno != ENOTSOCK)`
	`677`	`+ logerror("unable to set SO_KEEPALIVE on socket: %s",`
	`678`	`+ strerror(errno));`
	`679`	`+ }`
`678`	`680`	`}`
`679`	`681`
`680`	`682`	`static int execute(void)`