moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

David Byron's fix to allow the speed-limit logic work even if you set

Browse Source 
limit-rate. It does work on the expense of the rate limiter.
This commit is contained in:
Daniel Stenberg 2004-02-21 15:08:21 +00:00
parent 4bde770169
commit 243bd5bbb4
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@ -133,6 +133,14 @@ typedef char bool;
#define CURL_PROGRESS_STATS 0 /* default progress display */ #define CURL_PROGRESS_STATS 0 /* default progress display */
#define CURL_PROGRESS_BAR 1 #define CURL_PROGRESS_BAR 1
/**
* @def MIN
* standard MIN macro
*/
#ifndef MIN
#define MIN(X,Y) (((X) < (Y)) ? (X) : (Y))
#endif
typedef enum { typedef enum {
HTTPREQ_UNSPEC, HTTPREQ_UNSPEC,
HTTPREQ_GET, HTTPREQ_GET,
@ -2220,12 +2228,23 @@ static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
time_t timediff; time_t timediff;
time_t now; time_t now;
time_t sleep_time;
now = time(NULL); now = time(NULL);
timediff = now - config->lastrecvtime; timediff = now - config->lastrecvtime;
if( size*nmemb > config->recvpersecond*timediff) { if( size*nmemb > config->recvpersecond*timediff) {
/* figure out how many milliseconds to rest */ /* figure out how many milliseconds to rest */
go_sleep ( (size*nmemb)*1000/config->recvpersecond - timediff*1000 ); sleep_time = (size*nmemb)*1000/config->recvpersecond - timediff*1000;
/*
* Make sure we don't sleep for so long that we trigger the speed limit.
* This won't limit the bandwidth quite the way we've been asked to, but
* at least the transfer has a chance.
*/
if (config->low_speed_time > 0)
sleep_time = MIN(sleep_time,(config->low_speed_time * 1000) / 2);
go_sleep (sleep_time);
now = time(NULL); now = time(NULL);
} }
config->lastrecvtime = now; config->lastrecvtime = now;