- Christian Schmitz noticed that the progress meter/callback was not properly

used during the FTP connection phase (after the actual TCP connect), while
  it of course should be. I also made the speed check get called correctly so
  that really slow servers will trigger that properly too.
This commit is contained in:
Daniel Stenberg
2009-11-11 09:01:43 +00:00
parent 5d786d0e97
commit 107c4d878a
3 changed files with 16 additions and 1 deletions

View File

@@ -90,6 +90,7 @@
#include "multiif.h"
#include "url.h"
#include "rawstr.h"
#include "speedcheck.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -3069,6 +3070,13 @@ static CURLcode ftp_easy_statemach(struct connectdata *conn)
result = ftp_statemach_act(conn);
if(result)
break;
else if(Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK;
else
result = Curl_speedcheck(data, Curl_tvnow());
if(result)
break;
}
}