windows fix

2019-01-05 17:02:39 -08:00
parent b1e2c4ce72
commit 3cb2f6dcf7
2 changed files with 13 additions and 7 deletions
--- a/ixwebsocket/IXSocketConnect.cpp
+++ b/ixwebsocket/IXSocketConnect.cpp
@@ -76,12 +76,17 @@ namespace ix
        // block us for too long
        SocketConnect::configure(fd);

-        if (::connect(fd, address->ai_addr, address->ai_addrlen) == -1
-            && errno != EINPROGRESS)
+        if (::connect(fd, address->ai_addr, address->ai_addrlen) == -1)
        {
-            closeSocket(fd);
-            errMsg = strerror(errno);
-            return -1;
+#ifdef _WIN32
+            if (Socket::getErrno() == EWOULDBLOCK) errno = EINPROGRESS;
+#endif
+            if (errno != EINPROGRESS)
+            {
+                closeSocket(fd);
+                errMsg = strerror(errno);
+                return -1;
+            }
        }

        for (;;)