curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 11:02:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

tool: fix exponential retry delay

Browse Source 
Also, show retry delay with decimals since it might be not be integer
seconds.

Regression from da27db068f (shipped in 8.16.0)

Reported-by: Andrew Olsen
Fixes #18591
Assisted-by: Jay Satiro
Closes #18595
This commit is contained in:
Daniel Stenberg 2025-09-18 08:49:22 +02:00
parent 4e74b9f592
commit ca034e839c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tool_cfgable.c
View File

@ -52,7 +52,6 @@ struct OperationConfig *config_alloc(void)
config->ftp_skip_ip = TRUE; config->ftp_skip_ip = TRUE;
config->file_clobber_mode = CLOBBER_DEFAULT; config->file_clobber_mode = CLOBBER_DEFAULT;
config->upload_flags = CURLULFLAG_SEEN; config->upload_flags = CURLULFLAG_SEEN;
config->retry_delay_ms = RETRY_SLEEP_DEFAULT;
curlx_dyn_init(&config->postdata, MAX_FILE2MEMORY); curlx_dyn_init(&config->postdata, MAX_FILE2MEMORY);
return config; return config;
} }

3
src/tool_cfgable.h
View File

@ -209,7 +209,8 @@ struct OperationConfig {
long httpversion; long httpversion;
unsigned long socks5_auth;/* auth bitmask for socks5 proxies */ unsigned long socks5_auth;/* auth bitmask for socks5 proxies */
long req_retry; /* number of retries */ long req_retry; /* number of retries */
long retry_delay_ms; /* delay between retries (in milliseconds) */ long retry_delay_ms; /* delay between retries (in milliseconds),
0 means increase exponentially */
long retry_maxtime_ms; /* maximum time to keep retrying */ long retry_maxtime_ms; /* maximum time to keep retrying */
unsigned long mime_options; /* Mime option flags. */ unsigned long mime_options; /* Mime option flags. */

21
src/tool_operate.c
View File

@ -437,7 +437,6 @@ static CURLcode retrycheck(struct OperationConfig *config,
": FTP error" ": FTP error"
}; };
sleeptime = per->retry_sleep;
if(RETRY_HTTP == retry) { if(RETRY_HTTP == retry) {
curl_easy_getinfo(curl, CURLINFO_RETRY_AFTER, &retry_after); curl_easy_getinfo(curl, CURLINFO_RETRY_AFTER, &retry_after);
if(retry_after) { if(retry_after) {
@ -464,20 +463,28 @@ static CURLcode retrycheck(struct OperationConfig *config,
} }
} }
} }
if(!sleeptime && !config->retry_delay_ms) {
if(!per->retry_sleep)
per->retry_sleep = RETRY_SLEEP_DEFAULT;
else
per->retry_sleep *= 2;
if(per->retry_sleep > RETRY_SLEEP_MAX)
per->retry_sleep = RETRY_SLEEP_MAX;
}
if(!sleeptime)
sleeptime = per->retry_sleep;
warnf("Problem %s. " warnf("Problem %s. "
"Will retry in %ld second%s. " "Will retry in %ld%s%.*ld second%s. "
"%ld retr%s left.", "%ld retr%s left.",
m[retry], sleeptime/1000L, m[retry], sleeptime/1000L,
(sleeptime%1000L ? "." : ""),
(sleeptime%1000L ? 3 : 0),
sleeptime%1000L,
(sleeptime/1000L == 1 ? "" : "s"), (sleeptime/1000L == 1 ? "" : "s"),
per->retry_remaining, per->retry_remaining,
(per->retry_remaining > 1 ? "ies" : "y")); (per->retry_remaining > 1 ? "ies" : "y"));
per->retry_remaining--; per->retry_remaining--;
if(!config->retry_delay_ms) {
per->retry_sleep *= 2;
if(per->retry_sleep > RETRY_SLEEP_MAX)
per->retry_sleep = RETRY_SLEEP_MAX;
}
if(outs->bytes && outs->filename && outs->stream) { if(outs->bytes && outs->filename && outs->stream) {
#ifndef __MINGW32CE__ #ifndef __MINGW32CE__