From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 21 Aug 2015 11:30:08 +0000 (+0200)
Subject: ftp: clear the do_more bit when the server has connected
X-Git-Tag: curl-7_45_0~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38ef1b3e7f69e84b56dde28baca046a067dc0efb;p=thirdparty%2Fcurl.git

ftp: clear the do_more bit when the server has connected

The multi state machine would otherwise go into the DO_MORE state after
DO, even for the case when the FTP state machine had already performed
those duties, which caused libcurl to get stuck in that state and fail
miserably. This occured for for active ftp uploads.

Reported-by: Patricia Muscalu
---

diff --git a/lib/ftp.c b/lib/ftp.c
index fade092e4e..7b7e11389f 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -340,6 +340,9 @@ static CURLcode AcceptServerConnect(struct connectdata *conn)
     return CURLE_FTP_PORT_FAILED;
   }
   infof(data, "Connection accepted from server\n");
+  /* when this happens within the DO state it is important that we mark us as
+     not needing DO_MORE anymore */
+  conn->bits.do_more = FALSE;
 
   conn->sock[SECONDARYSOCKET] = s;
   (void)curlx_nonblock(s, TRUE); /* enable non-blocking */