Commit b0d42da2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi: start ftp state machine when switching to DO_MORE 

This extends the fix from commit d7934b8b

When the multi state is changed within the multi_runsingle from DOING to
DO_MORE, we didn't immediately start the FTP state machine again. That
then left the FTP state in FTP_STOP. When curl_multi_fdset() was
subsequently called, the ftp_domore_getsock() function would return the
wrong fd info.

Reported by: Gokhan Sengun
parent 120025b7

lib/multi.c

+5 −12
Original line number Diff line number Diff line
@@ -1339,18 +1339,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
                                         &dophase_done);

      if(CURLE_OK == easy->result) {

        if(dophase_done) {

          /* after DO, go PERFORM... or DO_MORE */

          if(easy->easy_conn->bits.do_more) {

            /* we're supposed to do more, but we need to sit down, relax

               and wait a little while first */

            multistate(easy, CURLM_STATE_DO_MORE);

            result = CURLM_OK;

          }

          else {

            /* we're done with the DO, now DO_DONE */

            multistate(easy, CURLM_STATE_DO_DONE);

          /* after DO, go DO_DONE or DO_MORE */

          multistate(easy, easy->easy_conn->bits.do_more?

                     CURLM_STATE_DO_MORE:

                     CURLM_STATE_DO_DONE);

          result = CURLM_CALL_MULTI_PERFORM;

          }

        } /* dophase_done */

      }

      else {