Commit 4b6c2408 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

moved the download/upload speed calculations, to be made on every invoke 

of the progressupdate, as on very quick transfers they wouldn't always get
calculated!
parent 022ea422

lib/progress.c

+5 −6
Original line number Diff line number Diff line
@@ -225,20 +225,19 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
  /* The exact time spent so far */

  data->progress.timespent = Curl_tvdiff (now, data->progress.start);



  if(data->progress.lastshow == Curl_tvlong(now))

    return 0; /* never update this more than once a second if the end isn't 

                 reached */

  data->progress.lastshow = now.tv_sec;



  /* The average download speed this far */

  data->progress.dlspeed = data->progress.downloaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0);



  /* The average upload speed this far */

  data->progress.ulspeed = data->progress.uploaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0);



  if(data->progress.lastshow == Curl_tvlong(now))

    return 0; /* never update this more than once a second if the end isn't 

                 reached */

  data->progress.lastshow = now.tv_sec;



  /* Let's do the "current speed" thing, which should use the fastest

         of the dl/ul speeds */



  data->progress.speeder[ nowindex ] =

    data->progress.downloaded>data->progress.uploaded?

    data->progress.downloaded:data->progress.uploaded;