Re: svn commit: r1927874 - in httpd/httpd/trunk: changes-entries modules/md

2025-08-19 Thread Stefan Eissing via dev



> Am 19.08.2025 um 12:05 schrieb Ruediger Pluem :
> 
> 
> 
> On 8/19/25 11:36 AM, [email protected] wrote:
>> Author: icing
>> Date: Tue Aug 19 09:36:21 2025
>> New Revision: 1927874
>> 
>> Log:
>> *) mod_md: update to version 2.6.2
>> - Fix error retry delay calculation to not already doubling the wait
>>   on the first error.
>> 
>> Added:
>>   httpd/httpd/trunk/changes-entries/md_v2.6.2.txt
>> Modified:
>>   httpd/httpd/trunk/modules/md/md_status.c
>>   httpd/httpd/trunk/modules/md/md_version.h
>> 
> 
>> 
>> Modified: httpd/httpd/trunk/modules/md/md_status.c
>> ==
>> --- httpd/httpd/trunk/modules/md/md_status.c Tue Aug 19 08:57:02 2025 
>> (r1927873)
>> +++ httpd/httpd/trunk/modules/md/md_status.c Tue Aug 19 09:36:21 2025 
>> (r1927874)
>> @@ -616,15 +616,13 @@ apr_time_t md_job_delay_on_errors(md_job
>>  * 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;
> 
> I guess the assumption is that job->min_delay always <= max_delay in case of 
> err_count == 1 :-)

I though about leaving the check in, but someone configuring the delay that 
large deserves to get it, at least on the first error.

đŸ˜Œ

> 
> Regards
> 
> RĂ¼diger
> 
> 



Re: svn commit: r1927874 - in httpd/httpd/trunk: changes-entries modules/md

2025-08-19 Thread Ruediger Pluem



On 8/19/25 11:36 AM, [email protected] wrote:
> Author: icing
> Date: Tue Aug 19 09:36:21 2025
> New Revision: 1927874
> 
> Log:
> *) mod_md: update to version 2.6.2
>  - Fix error retry delay calculation to not already doubling the wait
>on the first error.
> 
> Added:
>httpd/httpd/trunk/changes-entries/md_v2.6.2.txt
> Modified:
>httpd/httpd/trunk/modules/md/md_status.c
>httpd/httpd/trunk/modules/md/md_version.h
> 

> 
> Modified: httpd/httpd/trunk/modules/md/md_status.c
> ==
> --- httpd/httpd/trunk/modules/md/md_status.c  Tue Aug 19 08:57:02 2025
> (r1927873)
> +++ httpd/httpd/trunk/modules/md/md_status.c  Tue Aug 19 09:36:21 2025
> (r1927874)
> @@ -616,15 +616,13 @@ apr_time_t md_job_delay_on_errors(md_job
>   * 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;

I guess the assumption is that job->min_delay always <= max_delay in case of 
err_count == 1 :-)

Regards

RĂ¼diger