moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

speed caps: update the timeouts if the speed is too low/high 

Follow-up to 4b86113

Fixes https://github.com/curl/curl/issues/793
Fixes https://github.com/curl/curl/issues/942
This commit is contained in:
Michael Kaufmann 2017-01-29 17:14:05 +01:00
parent 4ddf9798ab
commit a5e8fcbc17
1 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lib/multi.c
View File

@ -1310,6 +1310,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
struct SingleRequest *k; struct SingleRequest *k;
time_t timeout_ms; time_t timeout_ms;
time_t recv_timeout_ms;
time_t send_timeout_ms;
int control; int control;
if(!GOOD_EASY_HANDLE(data)) if(!GOOD_EASY_HANDLE(data))
@ -1829,19 +1831,30 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
else else
result = Curl_speedcheck(data, now); result = Curl_speedcheck(data, now);
if(( (data->set.max_send_speed == 0) || if(!result) {
(Curl_pgrsLimitWaitTime(data->progress.uploaded, send_timeout_ms = 0;
data->progress.ul_limit_size, if(data->set.max_send_speed > 0)
data->set.max_send_speed, send_timeout_ms = Curl_pgrsLimitWaitTime(data->progress.uploaded,
data->progress.ul_limit_start, data->progress.ul_limit_size,
now) <= 0)) && data->set.max_send_speed,
( (data->set.max_recv_speed == 0) || data->progress.ul_limit_start,
(Curl_pgrsLimitWaitTime(data->progress.downloaded, now);
data->progress.dl_limit_size,
data->set.max_recv_speed, recv_timeout_ms = 0;
data->progress.dl_limit_start, if(data->set.max_recv_speed > 0)
now) <= 0))) recv_timeout_ms = Curl_pgrsLimitWaitTime(data->progress.downloaded,
multistate(data, CURLM_STATE_PERFORM); data->progress.dl_limit_size,
data->set.max_recv_speed,
data->progress.dl_limit_start,
now);
if(send_timeout_ms <= 0 && recv_timeout_ms <= 0)
multistate(data, CURLM_STATE_PERFORM);
else if(send_timeout_ms >= recv_timeout_ms)
Curl_expire_latest(data, send_timeout_ms);
else
Curl_expire_latest(data, recv_timeout_ms);
}
break; break;
case CURLM_STATE_PERFORM: case CURLM_STATE_PERFORM:
@ -1851,31 +1864,30 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
bool comeback = FALSE; bool comeback = FALSE;
/* check if over send speed */ /* check if over send speed */
if(data->set.max_send_speed > 0) { send_timeout_ms = 0;
timeout_ms = Curl_pgrsLimitWaitTime(data->progress.uploaded, if(data->set.max_send_speed > 0)
data->progress.ul_limit_size, send_timeout_ms = Curl_pgrsLimitWaitTime(data->progress.uploaded,
data->set.max_send_speed, data->progress.ul_limit_size,
data->progress.ul_limit_start, data->set.max_send_speed,
now); data->progress.ul_limit_start,
if(timeout_ms > 0) { now);
multistate(data, CURLM_STATE_TOOFAST);
Curl_expire_latest(data, timeout_ms);
break;
}
}
/* check if over recv speed */ /* check if over recv speed */
if(data->set.max_recv_speed > 0) { recv_timeout_ms = 0;
timeout_ms = Curl_pgrsLimitWaitTime(data->progress.downloaded, if(data->set.max_recv_speed > 0)
data->progress.dl_limit_size, recv_timeout_ms = Curl_pgrsLimitWaitTime(data->progress.downloaded,
data->set.max_recv_speed, data->progress.dl_limit_size,
data->progress.dl_limit_start, data->set.max_recv_speed,
now); data->progress.dl_limit_start,
if(timeout_ms > 0) { now);
multistate(data, CURLM_STATE_TOOFAST);
Curl_expire_latest(data, timeout_ms); if(send_timeout_ms > 0 || recv_timeout_ms > 0) {
break; multistate(data, CURLM_STATE_TOOFAST);
} if(send_timeout_ms >= recv_timeout_ms)
Curl_expire_latest(data, send_timeout_ms);
else
Curl_expire_latest(data, recv_timeout_ms);
break;
} }
/* read/write data if it is ready to do so */ /* read/write data if it is ready to do so */