On the trunk:

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

diff --git a/CHANGES b/CHANGES
index a4b560d5bff2e8b45119dcbc5a0cae7d4befb9d0..b1d264cfee4df8b8bbea7c62154b242a2bf6ed45 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 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]
 
   *) core: silently ignore a not existent file path when IncludeOptional

diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index c9acf03668ceb45de020559fa9ec237645e2e8d4..83ab715cab13e91b033fcc1e57eee7e33239aecd 100644 (file)
--- a/modules/md/md_version.h
+++ b/modules/md/md_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "1.0.1"
+#define MOD_MD_VERSION "1.0.2"
 
 /**
  * @macro
@@ -34,7 +34,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 0x010001
+#define MOD_MD_VERSION_NUM 0x010002
 
 #define MD_EXPERIMENTAL 0
 #define MD_ACME_DEF_URL    "https://acme-v01.api.letsencrypt.org/directory"

diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index fb2b4e90127cced9998466f74dab6ce382e8a117..f3907d054b90ea343e4429a22ecb706a15853f9f 100644 (file)
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -671,7 +671,8 @@ static apr_status_t check_job(md_watchdog *wd, md_job_t *job, apr_pool_t *ptemp)
     if (job->stalled) {
         /* Missing information, this will not change until configuration
          * is changed and server restarted */
-         return APR_INCOMPLETE;
+         rv = APR_INCOMPLETE;
+         goto out;
     }
     else if (job->renewed) {
         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));
     }
     
+out:
     if (error_runs != job->error_runs) {
         save_job_props(wd->reg, job, ptemp);
     }