aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-07-19 23:02:30 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-07-19 23:02:30 +0200
commite2e92486a740e9a5b984ae9ff8c74e9d50dd35d7 (patch)
tree56160caefe5a5c8b6d2f387cfdf642201ecc2468
parent2e5b3168d69b6b0156508102f72d455f5b3b6636 (diff)
ftp_do_more: consider DO_MORE complete when server connects back
In the case of an active connection when ftp_do_more() detects that the server has connected back, it must make sure to mark it as complete so that the multi_runsingle() function will detect this and move on to the next state. Bug: http://curl.haxx.se/mail/lib-2013-07/0115.html Reported-by: Clemens Gruber
-rw-r--r--lib/ftp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 5d78ad6ba..021796f0a 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3748,6 +3748,9 @@ static CURLcode ftp_do_more(struct connectdata *conn, bool *complete)
if(result)
return result;
+
+ *complete = TRUE; /* this state is now complete when the server has
+ connected back to us */
}
}
else if(data->set.upload) {