diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2010-09-14 22:40:05 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-09-14 22:40:05 +0200 |
| commit | 296b246b9cd1da5d13c56254e1c68914f8756a2e (patch) | |
| tree | 25d9c6abefa4e441ca59ea382bfb463a42f02f87 /lib | |
| parent | 5393f08df852df163822bbceae09a0878ca12198 (diff) | |
multi: don't do extra expire calls for the connection
The timeout is set for the connect phase already at the start of the
request so we should not add a new one, and we MUST not set expire to 0
as that will remove any other potentially existing timeouts.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/connect.c | 10 |
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); |