fix for millisecond resolution timeouts

This commit is contained in:
Yang Tse 2007-02-06 18:08:11 +00:00
parent e213555c98
commit 77fcad041f
2 changed files with 8 additions and 6 deletions

View file

@ -343,14 +343,14 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
/* get timeout */
if(data->set.timeout && data->set.connecttimeout) {
if (data->set.timeout < data->set.connecttimeout)
timeout = data->set.timeout*1000;
timeout = data->set.timeout;
else
timeout = data->set.connecttimeout*1000;
timeout = data->set.connecttimeout;
}
else if(data->set.timeout)
timeout = data->set.timeout*1000;
timeout = data->set.timeout;
else if(data->set.connecttimeout)
timeout = data->set.connecttimeout*1000;
timeout = data->set.connecttimeout;
else
timeout = DEFAULT_CONNECT_TIMEOUT;