diff options
| author | Gokhan Sengun <gokhansengun@gmail.com> | 2011-12-19 14:35:20 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-12-20 20:30:02 +0100 |
| commit | c834213ad52c52431e9ca597862dc81839cabe84 (patch) | |
| tree | 678dfd82d3129b8aef8a0222defc55244003203b /lib/progress.c | |
| parent | 5527417afae062d7a2b12ee80730a0ab22b86eab (diff) | |
FTP: perform active connections non-blocking
1- Two new error codes are introduced.
CURLE_FTP_ACCEPT_FAILED to be set whenever ACCEPTing fails because of
FTP server connected.
CURLE_FTP_ACCEPT_TIMEOUT to be set whenever ACCEPTing timeouts.
Neither of these errors are considered fatal and control connection
remains OK because it could just be a firewall blocking server to
connect to the client.
2- One new setopt option was introduced.
CURLOPT_ACCEPTTIMEOUT_MS
It sets the maximum amount of time FTP client is going to wait for a
server to connect. Internal default accept timeout is 60 seconds.
Diffstat (limited to 'lib/progress.c')
| -rw-r--r-- | lib/progress.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/progress.c b/lib/progress.c index 6abe72e56..1eeb78052 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -169,6 +169,10 @@ void Curl_pgrsTime(struct SessionHandle *data, timerid timer) data->progress.t_startsingle = now; break; + case TIMER_STARTACCEPT: + data->progress.t_acceptdata = Curl_tvnow(); + break; + case TIMER_NAMELOOKUP: data->progress.t_nslookup = Curl_tvdiff_secs(now, data->progress.t_startsingle); |