From 5e002bc21c6b7483592cd66417bf7a374590b973 Mon Sep 17 00:00:00 2001 From: Kristján Valur Jónsson 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