moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

pick the correct timeout before the connecthost call

This commit is contained in:
Daniel Stenberg 2001-10-01 23:25:59 +00:00
parent 9f77771ff9
commit 56ff2aa059
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/url.c
View File

@ -1118,13 +1118,6 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
{
long max_time=300000; /* milliseconds, default to five minutes */
#ifndef ENABLE_IPV6
conn->firstsocket = socket(AF_INET, SOCK_STREAM, 0);
#else
/* IPv6-style */
struct addrinfo *ai;
#endif
#if !defined(WIN32)||defined(__CYGWIN32__)
/* We don't generally like checking for OS-versions, we should make this
HAVE_XXXX based, although at the moment I don't have a decent test for
@ -1137,6 +1130,8 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
#endif
#ifndef ENABLE_IPV6
conn->firstsocket = socket(AF_INET, SOCK_STREAM, 0);
/*************************************************************
* Select device to bind socket to
*************************************************************/
@ -1261,7 +1256,11 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
#endif
/* get the most strict timeout of the ones converted to milliseconds */
max_time = min(data->set.timeout, data->set.connecttimeout)*1000;
if(data->set.timeout &&
(data->set.timeout>data->set.connecttimeout))
max_time = data->set.timeout*1000;
else
max_time = data->set.connecttimeout*1000;
/* subtract the passed time */
max_time -= (long)(has_passed * 1000);