luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

speedcheck: exclude paused transfers

Browse Source 
Paused transfers should not be stopped due to slow speed even when
CURLOPT_LOW_SPEED_LIMIT is set. Additionally, the slow speed timer is
now reset when the transfer is unpaused - as otherwise it would easily
just trigger immediately after unpausing.

Reported-by: Harry Sintonen
Fixes #6358
Closes #6359
This commit is contained in:
Daniel Stenberg 2020-12-22 09:54:06 +01:00
parent c7f95fa0cc
commit ac9a7245fc
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/libcurl/curl_easy_pause.3
View File

@ -49,6 +49,10 @@ will get your write callback called before this function returns.
The \fBhandle\fP argument is of course identifying the handle that operates on The \fBhandle\fP argument is of course identifying the handle that operates on
the connection you want to pause or unpause. the connection you want to pause or unpause.
A paused transfer is excluded from low speed cancels via the
\fBCURLOPT_LOW_SPEED_LIMIT(3)\fP option and unpausing a transfer will reset
the time period required for the low speed limit to be met.
The \fBbitmask\fP argument is a set of bits that sets the new state of the The \fBbitmask\fP argument is a set of bits that sets the new state of the
connection. The following bits can be used: connection. The following bits can be used:
.IP CURLPAUSE_RECV .IP CURLPAUSE_RECV

3
lib/easy.c
View File

@ -1080,6 +1080,9 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) { (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */ Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
/* reset the too-slow time keeper */
data->state.keeps_speed.tv_sec = 0;
if(!data->state.tempcount) if(!data->state.tempcount)
/* if not pausing again, force a recv/send check of this connection as /* if not pausing again, force a recv/send check of this connection as
the data might've been read off the socket already */ the data might've been read off the socket already */

4
lib/speedcheck.c
View File

@ -39,6 +39,10 @@ void Curl_speedinit(struct Curl_easy *data)
CURLcode Curl_speedcheck(struct Curl_easy *data, CURLcode Curl_speedcheck(struct Curl_easy *data,
struct curltime now) struct curltime now)
{ {
if(data->req.keepon & KEEP_RECV_PAUSE)
/* A paused transfer is not qualified for speed checks */
return CURLE_OK;
if((data->progress.current_speed >= 0) && data->set.low_speed_time) { if((data->progress.current_speed >= 0) && data->set.low_speed_time) {
if(data->progress.current_speed < data->set.low_speed_limit) { if(data->progress.current_speed < data->set.low_speed_limit) {
if(!data->state.keeps_speed.tv_sec) if(!data->state.keeps_speed.tv_sec)