timeleft_accept: ack global timeout, moved to ftp.c

First off the timeout for accepting a server connect back must of course
respect a global timeout. Then the timeleft function is only used by ftp
code so it was moved to ftp.c and made static.
This commit is contained in:
Daniel Stenberg
2011-12-20 20:55:54 +01:00
parent 6222ef8052
commit 130fac6c16
4 changed files with 42 additions and 35 deletions

View File

@@ -43,12 +43,7 @@ long Curl_timeleft(struct SessionHandle *data,
struct timeval *nowp,
bool duringconnect);
/* function that returns how much time there's left to wait for incoming
server connect */
long Curl_timeleft_accept(struct SessionHandle *data);
#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
#define DEFAULT_ACCEPT_TIMEOUT 60000 /* milliseconds == one minute */
/*
* Used to extract socket and connectdata struct for the most recent