generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
to my previous brain-damaged version)
This commit is contained in:
Daniel Stenberg 2006-04-18 22:10:19 +00:00
parent 48f56d9600
commit 38898ba4af
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ssluse.c
View File

@ -1313,7 +1313,7 @@ Curl_ossl_connect_step1(struct connectdata *conn,
static CURLcode static CURLcode
Curl_ossl_connect_step2(struct connectdata *conn, Curl_ossl_connect_step2(struct connectdata *conn,
int sockindex, long* timeout_ms) int sockindex, long *timeout_ms)
{ {
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
int err; 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 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 and then how much time that has elapsed to know how much time we
allow for the connect call */ 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 */ /* get the most strict timeout of the ones converted to milliseconds */
if(data->set.timeout && if(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;
} }
else if(data->set.timeout)
*timeout_ms = data->set.timeout*1000;
else if(data->set.connecttimeout)
*timeout_ms = data->set.connecttimeout*1000;
else else
/* no particular time-out has been set */ /* no particular time-out has been set */
*timeout_ms= DEFAULT_CONNECT_TIMEOUT; *timeout_ms= DEFAULT_CONNECT_TIMEOUT;