system/EventPipe: fix WSAEINPROGRESS on Windows

Apparently, connecting a socket to a loopback address can block on Windows, and a non-blocking socket will return WSAEINPROGRESS. This broken PoorSocketPair() in commit 2119e4fd, which made the socket non-blocking right from the start. This fix postpones the ioctlsocket(FIONBIO) call until after the connect(). Closes #134

system/EventPipe: fix WSAEINPROGRESS on Windows
b177bffa · Max Kellermann · b4b468eb · b177bffa
Commit b177bffa authored Oct 24, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

EventPipe.cxx src/system/EventPipe.cxx +3 -1

No files found.
--- a/src/system/EventPipe.cxx
+++ b/src/system/EventPipe.cxx
@@ -113,12 +113,14 @@ PoorSocketPair(int fd[2])
 		throw MakeSocketError("Failed to listen on socket");

 	UniqueSocketDescriptor socket0;
-	if (!socket0.CreateNonBlock(AF_INET, SOCK_STREAM, IPPROTO_TCP))
+	if (!socket0.Create(AF_INET, SOCK_STREAM, IPPROTO_TCP))
 		throw MakeSocketError("Failed to create socket");

 	if (!socket0.Connect(listen_socket.GetLocalAddress()))
 		throw MakeSocketError("Failed to connect socket");

+	socket0.SetNonBlocking();
+
 	auto socket1 = listen_socket.AcceptNonBlock();
 	if (!socket1.IsDefined())
 		throw MakeSocketError("Failed to accept connection");