Commit 1213baba authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

progress: let "current speed" be UL + DL speeds combined 

Bug #1556
Reported-by: Paul Harris
Closes #1559
parent 31a67ac1

lib/progress.c

+5 −7
Original line number Diff line number Diff line
@@ -380,11 +380,10 @@ int Curl_pgrsUpdate(struct connectdata *conn) 


    data->progress.lastshow = now.tv_sec;



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

       of the dl/ul speeds. Store the faster speed at entry 'nowindex'. */

    /* Let's do the "current speed" thing, with the dl + ul speeds

       combined. Store the speed at entry 'nowindex'. */

    data->progress.speeder[ nowindex ] =

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

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

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



    /* remember the exact time for this moment */

    data->progress.speeder_time [ nowindex ] = now;
@@ -433,10 +432,9 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
      }

    }

    else

      /* the first second we use the main average */

      /* the first second we use the average */

      data->progress.current_speed =

        (data->progress.ulspeed>data->progress.dlspeed)?

        data->progress.ulspeed:data->progress.dlspeed;

        data->progress.ulspeed + data->progress.dlspeed;



  } /* Calculations end */