www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

On the trunk:

Browse Source 
mod_md: v1.0.2, fix staging reset when MDCertificateAgreemen was initially missing.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815078 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2017-11-13 10:47:35 +00:00
parent 02cda84c79
commit 590d5c67a8
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.1 Changes with Apache 2.5.1
*) mod_md: v1.0.2, fix staging reset when MDCertificateAgreemen was initially missing.
[Stefan Eissing]
*) mod_watchdog: Correct some log messages. [Rainer Jung] *) mod_watchdog: Correct some log messages. [Rainer Jung]
*) core: silently ignore a not existent file path when IncludeOptional *) core: silently ignore a not existent file path when IncludeOptional

4
modules/md/md_version.h
View File

@@ -26,7 +26,7 @@
* @macro * @macro
* Version number of the md module as c string * Version number of the md module as c string
*/ */
#define MOD_MD_VERSION "1.0.1" #define MOD_MD_VERSION "1.0.2"
/** /**
* @macro * @macro
@@ -34,7 +34,7 @@
* release. This is a 24 bit number with 8 bits for major number, 8 bits * 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. * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/ */
#define MOD_MD_VERSION_NUM 0x010001 #define MOD_MD_VERSION_NUM 0x010002
#define MD_EXPERIMENTAL 0 #define MD_EXPERIMENTAL 0
#define MD_ACME_DEF_URL "https://acme-v01.api.letsencrypt.org/directory" #define MD_ACME_DEF_URL "https://acme-v01.api.letsencrypt.org/directory"

4
modules/md/mod_md.c
View File

@@ -671,7 +671,8 @@ static apr_status_t check_job(md_watchdog *wd, md_job_t *job, apr_pool_t *ptemp)
if (job->stalled) { if (job->stalled) {
/* Missing information, this will not change until configuration /* Missing information, this will not change until configuration
* is changed and server restarted */ * is changed and server restarted */
return APR_INCOMPLETE; rv = APR_INCOMPLETE;
goto out;
} }
else if (job->renewed) { else if (job->renewed) {
assess_renewal(wd, job, ptemp); assess_renewal(wd, job, ptemp);
@@ -720,6 +721,7 @@ static apr_status_t check_job(md_watchdog *wd, md_job_t *job, apr_pool_t *ptemp)
job->md->name, job->error_runs, md_print_duration(ptemp, delay)); job->md->name, job->error_runs, md_print_duration(ptemp, delay));
} }
out:
if (error_runs != job->error_runs) { if (error_runs != job->error_runs) {
save_job_props(wd->reg, job, ptemp); save_job_props(wd->reg, job, ptemp);
} }