Commit 5850a8ec authored by michael-grunder's avatar michael-grunder
Browse files

Ensure we curry any connect error to an async context.

parent b6f86f38
...@@ -604,7 +604,8 @@ static int __redisAsyncHandleConnect(redisAsyncContext *ac) { ...@@ -604,7 +604,8 @@ static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
if (redisCheckConnectDone(c, &completed) == REDIS_ERR) { if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
/* Error! */ /* Error! */
redisCheckSocketError(c); if (redisCheckSocketError(c) == REDIS_ERR)
__redisAsyncCopyError(ac);
__redisAsyncHandleConnectFailure(ac); __redisAsyncHandleConnectFailure(ac);
return REDIS_ERR; return REDIS_ERR;
} else if (completed == 1) { } else if (completed == 1) {
...@@ -696,7 +697,7 @@ void redisAsyncHandleTimeout(redisAsyncContext *ac) { ...@@ -696,7 +697,7 @@ void redisAsyncHandleTimeout(redisAsyncContext *ac) {
return; return;
} }
if (!ac->c.command_timeout || if (!ac->c.command_timeout ||
(!ac->c.command_timeout->tv_sec && !ac->c.command_timeout->tv_usec)) { (!ac->c.command_timeout->tv_sec && !ac->c.command_timeout->tv_usec)) {
/* A belated connect timeout arriving, ignore */ /* A belated connect timeout arriving, ignore */
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment