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

Fixed the resumed FTP upload loop to not require that the read callback

returns a full buffer on each invoke.
parent 46e6115d
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -1570,12 +1570,13 @@ static CURLcode ftp_state_ul_setup(struct connectdata *conn,
                    conn->fread_in);

      passed += actuallyread;
      if(actuallyread != readthisamountnow) {
        failf(data, "Could only read %" FORMAT_OFF_T
              " bytes from the input", passed);
      if((actuallyread <= 0) || (actuallyread > readthisamountnow)) {
        /* this checks for greater-than only to make sure that the
           CURL_READFUNC_ABORT return code still aborts */
        failf(data, "Failed to read data");
        return CURLE_FTP_COULDNT_USE_REST;
      }
    } while(passed != data->state.resume_from);
    } while(passed < data->state.resume_from);

    /* now, decrease the size of the read */
    if(data->set.infilesize>0) {