diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/connect.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/connect.c b/lib/connect.c index 7efa9f006..749f8cb2a 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -364,8 +364,13 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ #endif /* get the most strict timeout of the ones converted to milliseconds */ - if(data->set.timeout && - (data->set.timeout < data->set.connecttimeout)) + if(data->set.timeout && data->set.connecttimeout) { + if (data->set.timeout < data->set.connecttimeout) + timeout_ms = data->set.timeout*1000; + else + timeout_ms = data->set.connecttimeout*1000; + } + else if(data->set.timeout) timeout_ms = data->set.timeout*1000; else timeout_ms = data->set.connecttimeout*1000; |