Merge pull request #935 from kristjanvalur/pr5

Bugfix: Ignore timeout callback from a successful connect (fixes #945)
redis · May 2, 2021 · 667dbf5 · 667dbf5
2 parents 9bf6c25 + e06ecf7
commit 667dbf5
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/async.c b/async.c
@@ -690,9 +690,17 @@ void redisAsyncHandleTimeout(redisAsyncContext *ac) {
     redisContext *c = &(ac->c);
     redisCallback cb;
 
-    if ((c->flags & REDIS_CONNECTED) && ac->replies.head == NULL) {
-        /* Nothing to do - just an idle timeout */
-        return;
+    if ((c->flags & REDIS_CONNECTED)) {
+        if ( ac->replies.head == NULL) {
+            /* Nothing to do - just an idle timeout */
+            return;
+        }
+
+        if (!ac->c.command_timeout || 
+            (!ac->c.command_timeout->tv_sec && !ac->c.command_timeout->tv_usec)) {
+            /* A belated connect timeout arriving, ignore */
+            return;
+        }
     }
 
     if (!c->err) {