From 5e002bc21c6b7483592cd66417bf7a374590b973 Mon Sep 17 00:00:00 2001
From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Fri, 26 Mar 2021 14:40:32 +0000
Subject: Support failed async connects on windows.

---
 net.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'net.c')

diff --git a/net.c b/net.c
index c6b0e5d..d9e6d7a 100644
--- a/net.c
+++ b/net.c
@@ -277,12 +277,29 @@ int redisCheckConnectDone(redisContext *c, int *completed) {
         *completed = 1;
         return REDIS_OK;
     }
-    switch (errno) {
+    int error = errno;
+    if (error == EINPROGRESS)
+    {
+        /* must check error to see if connect failed.  Get the socket error */
+        int fail, so_error, optlen;
+        optlen = sizeof(so_error);
+        fail = getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &so_error, &optlen);
+        if (fail == 0) {
+            if (so_error == 0) {
+                /* ocket is connected! */
+                *completed = 1;
+                return REDIS_OK;
+            }
+            /* connection error; */
+            errno = so_error; 
+            error = so_error;
+        }
+    }
+    switch (error) {
     case EISCONN:
         *completed = 1;
         return REDIS_OK;
     case EALREADY:
-    case EINPROGRESS:
     case EWOULDBLOCK:
         *completed = 0;
         return REDIS_OK;
-- 
cgit v1.2.3


From 94c1985bde0751fabc31deba437ffa6f6d52b696 Mon Sep 17 00:00:00 2001
From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Thu, 8 Apr 2021 10:03:22 +0000
Subject: Use correct type for getsockopt()

---
 net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'net.c')

diff --git a/net.c b/net.c
index d9e6d7a..d252555 100644
--- a/net.c
+++ b/net.c
@@ -281,8 +281,8 @@ int redisCheckConnectDone(redisContext *c, int *completed) {
     if (error == EINPROGRESS)
     {
         /* must check error to see if connect failed.  Get the socket error */
-        int fail, so_error, optlen;
-        optlen = sizeof(so_error);
+        int fail, so_error;
+        socklen_t optlen = sizeof(so_error);
         fail = getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &so_error, &optlen);
         if (fail == 0) {
             if (so_error == 0) {
-- 
cgit v1.2.3


From f246ee433d7d46b8132781759c660f9cb70b417d Mon Sep 17 00:00:00 2001
From: michael-grunder <michael.grunder@gmail.com>
Date: Sun, 26 Jun 2022 14:14:58 -0700
Subject: Whitespace, style

---
 net.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'net.c')

diff --git a/net.c b/net.c
index d252555..3ff89ed 100644
--- a/net.c
+++ b/net.c
@@ -278,20 +278,19 @@ int redisCheckConnectDone(redisContext *c, int *completed) {
         return REDIS_OK;
     }
     int error = errno;
-    if (error == EINPROGRESS)
-    {
+    if (error == EINPROGRESS) {
         /* must check error to see if connect failed.  Get the socket error */
         int fail, so_error;
         socklen_t optlen = sizeof(so_error);
         fail = getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &so_error, &optlen);
         if (fail == 0) {
             if (so_error == 0) {
-                /* ocket is connected! */
+                /* Socket is connected! */
                 *completed = 1;
                 return REDIS_OK;
             }
             /* connection error; */
-            errno = so_error; 
+            errno = so_error;
             error = so_error;
         }
     }
-- 
cgit v1.2.3