diff options
| -rw-r--r-- | docs/libcurl/curl_easy_pause.3 | 4 | ||||
| -rw-r--r-- | lib/easy.c | 3 | ||||
| -rw-r--r-- | lib/speedcheck.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/libcurl/curl_easy_pause.3 b/docs/libcurl/curl_easy_pause.3 index 0c1edb444..ab8258380 100644 --- a/docs/libcurl/curl_easy_pause.3 +++ b/docs/libcurl/curl_easy_pause.3 @@ -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 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 connection. The following bits can be used: .IP CURLPAUSE_RECV diff --git a/lib/easy.c b/lib/easy.c index dc790b01d..311946bdf 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -1080,6 +1080,9 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action) (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) { 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 not pausing again, force a recv/send check of this connection as the data might've been read off the socket already */ diff --git a/lib/speedcheck.c b/lib/speedcheck.c index 2665a44c5..841d256b4 100644 --- a/lib/speedcheck.c +++ b/lib/speedcheck.c @@ -39,6 +39,10 @@ void Curl_speedinit(struct Curl_easy *data) CURLcode Curl_speedcheck(struct Curl_easy *data, 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 < data->set.low_speed_limit) { if(!data->state.keeps_speed.tv_sec) |