From 107c4d878abea8940cae85bc9d330c13481ea634 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 11 Nov 2009 09:01:43 +0000
Subject: - 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.

---
 lib/ftp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/ftp.c')

diff --git a/lib/ftp.c b/lib/ftp.c
index a2332234d..14d4b929f 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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;
     }
   }
 
-- 
cgit v1.2.3