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/multi.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/multi.c')
| -rw-r--r-- | lib/multi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/multi.c b/lib/multi.c index e5073432e..e408ab184 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1388,6 +1388,13 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, break; case CURLM_STATE_DO_DONE: + + if(easy->easy_conn->bits.wait_data_conn == TRUE) { + multistate(easy, CURLM_STATE_DO_MORE); + result = CURLM_OK; + break; + } + /* Move ourselves from the send to recv pipeline */ moveHandleFromSendToRecvPipeline(data, easy->easy_conn); /* Check if we can move pending requests to send pipe */ |