From 4e9d3c26ed74ec7a00cfc32170dc7289589586e8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 31 Aug 2009 20:49:30 +0000 Subject: - When using the multi interface with FTP and you asked for NOBODY, you did no QUOTE commands and the request used the same path as the connection had already changed to, it would decide that no commands would be necessary for the "DO" action and that was not handled properly but libcurl would instead hang. --- lib/ftp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ftp.c b/lib/ftp.c index 26cf19795..99115dda6 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3026,10 +3026,14 @@ static CURLcode ftp_multi_statemach(struct connectdata *conn, } else if(rc != 0) { result = ftp_statemach_act(conn); - *done = (bool)(ftpc->state == FTP_STOP); } /* if rc == 0, then select() timed out */ + /* Check for the state outside of the Curl_socket_ready() return code checks + since at times we are in fact already in this state when this function + gets called. */ + *done = (bool)(ftpc->state == FTP_STOP); + return result; } -- cgit v1.2.3