aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/connect.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/connect.c b/lib/connect.c
index 172ccbbbf..e440913e9 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -635,13 +635,6 @@ CURLcode Curl_is_connected(struct connectdata *conn,
if(conn->bits.tcpconnect) {
/* we are connected already! */
- long allow_total = 0;
-
- /* subtract the most strict timeout of the ones */
- if(data->set.timeout)
- allow_total = data->set.timeout;
-
- Curl_expire(data, allow_total);
*connected = TRUE;
return CURLE_OK;
}
@@ -655,8 +648,6 @@ CURLcode Curl_is_connected(struct connectdata *conn,
return CURLE_OPERATION_TIMEDOUT;
}
- Curl_expire(data, allow);
-
/* check for connect without timeout as we want to return immediately */
rc = waitconnect(conn, sockfd, 0);
if(WAITCONN_TIMEOUT == rc)
@@ -1028,7 +1019,6 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
failf(data, "Connection time-out");
return CURLE_OPERATION_TIMEDOUT;
}
- Curl_expire(data, timeout_ms);
/* Max time for each address */
num_addr = Curl_num_addresses(remotehost->addr);