Commit Diff

Commit:
955f07e2ff6dd257e5b2bd84247aa3dbe8006464
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: gotwebd: macos accept4 -> accept accept4() doesn't exist on MacOS, so will likely need to set fcntl() on the FD.
Actions:
Patch | Tree
commit - b7ec583187229afb41e581a1063e04ab6239584d
commit + 955f07e2ff6dd257e5b2bd84247aa3dbe8006464
blob - db5c23f630c6bd7e85a480ad591aeb67d9da8bbc
blob + 17c763b271f67a8fec0c5e7c801f8c3c875d4ae2
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
@@ -622,9 +622,14 @@ sockets_accept_reserve(int sockfd, struct sockaddr *ad
 		errno = EMFILE;
 		return -1;
 	}
+/* TA:  This needs fixing upstream. */
+#ifdef __APPLE__
+	ret = accept(sockfd, addr, addrlen);
+#else
+	ret = accept4(sockfd, addr, addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC);
+#endif
 
-	if ((ret = accept4(sockfd, addr, addrlen,
-	    SOCK_NONBLOCK | SOCK_CLOEXEC)) > -1) {
+	if (ret > -1) {
 		(*counter)++;
 		log_debug("inflight incremented, now %d", *counter);
 	}