From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 19 Jul 2013 21:02:30 +0000 (+0200)
Subject: ftp_do_more: consider DO_MORE complete when server connects back
X-Git-Tag: upstream/7.37.1~1537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2e92486a740e9a5b984ae9ff8c74e9d50dd35d7;p=platform%2Fupstream%2Fcurl.git

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
---

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) {