Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and
CURLOPT_TIMEOUT, the _longer_ time would wrongly be used for the SSL connection time-out!
This commit is contained in:
parent
686d90745b
commit
676597e961
@ -1332,7 +1332,7 @@ Curl_ossl_connect_step2(struct connectdata *conn,
|
|||||||
|
|
||||||
/* get the most strict timeout of the ones converted to milliseconds */
|
/* get the most strict timeout of the ones converted to milliseconds */
|
||||||
if(data->set.timeout &&
|
if(data->set.timeout &&
|
||||||
(data->set.timeout>data->set.connecttimeout))
|
(data->set.timeout<data->set.connecttimeout))
|
||||||
*timeout_ms = data->set.timeout*1000;
|
*timeout_ms = data->set.timeout*1000;
|
||||||
else
|
else
|
||||||
*timeout_ms = data->set.connecttimeout*1000;
|
*timeout_ms = data->set.connecttimeout*1000;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user