Skip to content

Commit 1ff8121

Browse files
committed
*) 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
1 parent 9480982 commit 1ff8121

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

changes-entries/md_v2.6.2.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*) mod_md: update to version 2.6.2
2+
- Fix error retry delay calculation to not already doubling the wait
3+
on the first error.

modules/md/md_status.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,15 +616,13 @@ apr_time_t md_job_delay_on_errors(md_job_t *job, int err_count, const char *last
616616
* As apr_time_t is signed, this might wrap around*/
617617
int i;
618618
delay = job->min_delay;
619-
for (i = 0; i < err_count; ++i) {
619+
for (i = 0; i < (err_count - 1); ++i) {
620620
delay <<= 1;
621621
if ((delay <= 0) || (delay > max_delay)) {
622622
delay = max_delay;
623623
break;
624624
}
625625
}
626-
if (delay > max_delay)
627-
delay = max_delay;
628626
}
629627
if (delay > 0) {
630628
/* jitter the delay by +/- 0-50%.

modules/md/md_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
* @macro
2828
* Version number of the md module as c string
2929
*/
30-
#define MOD_MD_VERSION "2.6.1"
30+
#define MOD_MD_VERSION "2.6.2"
3131

3232
/**
3333
* @macro
3434
* Numerical representation of the version number of the md module
3535
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3636
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3737
*/
38-
#define MOD_MD_VERSION_NUM 0x020601
38+
#define MOD_MD_VERSION_NUM 0x020602
3939

4040
#define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory"
4141

0 commit comments

Comments
 (0)