diff options
author | Daniel Stenberg <daniel@haxx.se> | 2007-03-11 09:11:29 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2007-03-11 09:11:29 +0000 |
commit | c8cd13337efcd45e918fab824b226e4ae6338ea0 (patch) | |
tree | 41c1184f8a80120d392ae8a94e272eb045e4a22e /lib/progress.c | |
parent | 40e9e40cb41f3755b7a07c7d73cac59a6633f121 (diff) | |
download | curl-c8cd13337efcd45e918fab824b226e4ae6338ea0.tar.gz |
reverted the pselect patch => http://curl.haxx.se/mail/lib-2007-03/0100.html
Diffstat (limited to 'lib/progress.c')
-rw-r--r-- | lib/progress.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/progress.c b/lib/progress.c index 65bd4a7bb..5ba829a03 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -280,6 +280,9 @@ int Curl_pgrsUpdate(struct connectdata *conn) ((double)data->progress.uploaded/ (data->progress.timespent>0?data->progress.timespent:1)); + 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 @@ -356,10 +359,6 @@ int Curl_pgrsUpdate(struct connectdata *conn) return result; } - if(data->progress.lastshow == Curl_tvlong(now)) - return 0; /* never update this more than once a second if the end isn't - reached */ - /* Figure out the estimated time of arrival for the upload */ if((data->progress.flags & PGRS_UL_SIZE_KNOWN) && (data->progress.ulspeed>0) && |