From c3dfe50aafb5f1687889da114d811f823791ebd7 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 14 Feb 2003 09:11:51 +0000
Subject: [PATCH] Fix Curl_is_connected() even more to deal with waitconnect()
return codes even better (also based on input from Martin).
---
lib/connect.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/connect.c b/lib/connect.c
index 6e3df6627a..98bdaca319 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -144,7 +144,11 @@ int Curl_nonblock(int socket, /* operate on this */
}
/*
- * Return 0 on fine connect, -1 on error and 1 on timeout.
+ * waitconnect() returns:
+ * 0 fine connect
+ * -1 select() error
+ * 1 select() timeout
+ * 2 select() returned with an error condition
*/
static
int waitconnect(int sockfd, /* socket */
@@ -409,7 +413,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
if(err)
return CURLE_COULDNT_CONNECT;
}
- else if(2 == rc)
+ else if(1 != rc)
return CURLE_COULDNT_CONNECT;
/*
--
GitLab