From: Stefan Eissing Date: Tue, 19 Aug 2025 09:36:21 +0000 (+0000) Subject: *) mod_md: update to version 2.6.2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ff81212d02a0b4cc76bc5238a618aa56f213a57;p=thirdparty%2Fapache%2Fhttpd.git *) mod_md: update to version 2.6.2 - Fix error retry delay calculation to not already doubling the wait on the first error. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927874 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/changes-entries/md_v2.6.2.txt b/changes-entries/md_v2.6.2.txt new file mode 100644 index 0000000000..d5194c2ba0 --- /dev/null +++ b/changes-entries/md_v2.6.2.txt @@ -0,0 +1,3 @@ + *) mod_md: update to version 2.6.2 + - Fix error retry delay calculation to not already doubling the wait + on the first error. diff --git a/modules/md/md_status.c b/modules/md/md_status.c index e7d764519f..3572168081 100644 --- a/modules/md/md_status.c +++ b/modules/md/md_status.c @@ -616,15 +616,13 @@ apr_time_t md_job_delay_on_errors(md_job_t *job, int err_count, const char *last * As apr_time_t is signed, this might wrap around*/ int i; delay = job->min_delay; - for (i = 0; i < err_count; ++i) { + for (i = 0; i < (err_count - 1); ++i) { delay <<= 1; if ((delay <= 0) || (delay > max_delay)) { delay = max_delay; break; } } - if (delay > max_delay) - delay = max_delay; } if (delay > 0) { /* jitter the delay by +/- 0-50%. diff --git a/modules/md/md_version.h b/modules/md/md_version.h index 8ae950a457..46a154432b 100644 --- a/modules/md/md_version.h +++ b/modules/md/md_version.h @@ -27,7 +27,7 @@ * @macro * Version number of the md module as c string */ -#define MOD_MD_VERSION "2.6.1" +#define MOD_MD_VERSION "2.6.2" /** * @macro @@ -35,7 +35,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_MD_VERSION_NUM 0x020601 +#define MOD_MD_VERSION_NUM 0x020602 #define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory"