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

non-blocking active FTP: cleanup multi state usage

Browse Source 
Backpedaled out the funny double-change of state in the multi state
machine by adding a new argument to the do_more() function to signal
completion. This way it can remain in the DO_MORE state properly until
done. Long term, the entire DO_MORE logic should be moved into the FTP
code and be hidden from the multi code as the logic is only used for
FTP.
This commit is contained in:
Daniel Stenberg
2011-12-20 12:52:24 +01:00
parent c834213ad5
commit dfdac61522
5 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/url.c
View File

@@ -5457,14 +5457,25 @@ CURLcode Curl_do(struct connectdata **connp, bool *done)
return result;
}
CURLcode Curl_do_more(struct connectdata *conn)
/*
* Curl_do_more() is called during the DO_MORE multi state. It is basically a
* second stage DO state which (wrongly) was introduced to support FTP's
* second connection.
*
* TODO: A future libcurl should be able to work away this state.
*
*/
CURLcode Curl_do_more(struct connectdata *conn, bool *completed)
{
CURLcode result=CURLE_OK;
if(conn->handler->do_more)
result = conn->handler->do_more(conn);
*completed = FALSE;
if(result == CURLE_OK && conn->bits.wait_data_conn == FALSE)
if(conn->handler->do_more)
result = conn->handler->do_more(conn, completed);
if(!result && completed)
/* do_complete must be called after the protocol-specific DO function */
do_complete(conn);