mirror of
https://github.com/moparisthebest/curl
synced 2024-11-13 21:15:08 -05:00
7fffe97b78
With the introduction of expire IDs and the fact that existing timers
can be removed now and thus never expire, the concept with adding a
"latest" timer is not working anymore as it risks to not expire at all.
So, to be certain the timers actually are in line and will expire, the
plain Curl_expire() needs to be used. The _latest() function was added
as a sort of shortcut in the past that's quite simply not necessary
anymore.
Follow-up to 31b39c40cf
Reported-by: Paul Harris
Closes #1555
74 lines
2.4 KiB
C
74 lines
2.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
#include "urldata.h"
|
|
#include "sendf.h"
|
|
#include "multiif.h"
|
|
#include "speedcheck.h"
|
|
|
|
void Curl_speedinit(struct Curl_easy *data)
|
|
{
|
|
memset(&data->state.keeps_speed, 0, sizeof(struct timeval));
|
|
}
|
|
|
|
/*
|
|
* @unittest: 1606
|
|
*/
|
|
CURLcode Curl_speedcheck(struct Curl_easy *data,
|
|
struct timeval now)
|
|
{
|
|
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)
|
|
/* under the limit at this very moment */
|
|
data->state.keeps_speed = now;
|
|
else {
|
|
/* how long has it been under the limit */
|
|
time_t howlong = Curl_tvdiff(now, data->state.keeps_speed);
|
|
|
|
if(howlong >= data->set.low_speed_time * 1000) {
|
|
/* too long */
|
|
failf(data,
|
|
"Operation too slow. "
|
|
"Less than %ld bytes/sec transferred the last %ld seconds",
|
|
data->set.low_speed_limit,
|
|
data->set.low_speed_time);
|
|
return CURLE_OPERATION_TIMEDOUT;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
/* faster right now */
|
|
data->state.keeps_speed.tv_sec = 0;
|
|
}
|
|
|
|
if(data->set.low_speed_limit)
|
|
/* if low speed limit is enabled, set the expire timer to make this
|
|
connection's speed get checked again in a second */
|
|
Curl_expire(data, 1000, EXPIRE_SPEEDCHECK);
|
|
|
|
return CURLE_OK;
|
|
}
|