Skip to content
Snippets Groups Projects
Commit 38898ba4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

corrected the SSL timeout, as Ates Goral's patch did it and that works (opposed

to my previous brain-damaged version)
parent 48f56d96
No related branches found
No related tags found
No related merge requests found
......@@ -1313,7 +1313,7 @@ Curl_ossl_connect_step1(struct connectdata *conn,
static CURLcode
Curl_ossl_connect_step2(struct connectdata *conn,
int sockindex, long* timeout_ms)
int sockindex, long *timeout_ms)
{
struct SessionHandle *data = conn->data;
int err;
......@@ -1328,15 +1328,17 @@ Curl_ossl_connect_step2(struct connectdata *conn,
Otherwise, figure out the most strict timeout of the two possible one
and then how much time that has elapsed to know how much time we
allow for the connect call */
if(data->set.timeout || data->set.connecttimeout) {
if(data->set.timeout && data->set.connecttimeout) {
/* 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)
*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 if(data->set.connecttimeout)
*timeout_ms = data->set.connecttimeout*1000;
else
/* no particular time-out has been set */
*timeout_ms= DEFAULT_CONNECT_TIMEOUT;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment