diff options
Diffstat (limited to 'lib/socks.c')
| -rw-r--r-- | lib/socks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/socks.c b/lib/socks.c index 32d0c4b54..b8bda8eeb 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -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; |