From: Stefan Eissing <icing@apache.org>
Date: Fri, 25 Oct 2019 12:40:50 +0000 (+0000)
Subject: mod_md: fixes compiler warning about initialization, version bumb.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1849
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29761d0a18294ec32dedaeba086ddc6a41f5bc0c;p=thirdparty%2Fapache%2Fhttpd.git

mod_md: fixes compiler warning about initialization, version bumb.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1868927 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index ebc4375cbf0..bff92fcf5a1 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.2.0"
+#define MOD_MD_VERSION "2.2.1"
 
 /**
  * @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 0x020200
+#define MOD_MD_VERSION_NUM 0x020201
 
 #define MD_ACME_DEF_URL    "https://acme-v02.api.letsencrypt.org/directory"
 
diff --git a/modules/md/mod_md_drive.c b/modules/md/mod_md_drive.c
index e412479c6c1..1191a5fc3db 100644
--- a/modules/md/mod_md_drive.c
+++ b/modules/md/mod_md_drive.c
@@ -71,7 +71,7 @@ struct md_renew_ctx_t {
 static void process_drive_job(md_renew_ctx_t *dctx, md_job_t *job, apr_pool_t *ptemp)
 {
     const md_t *md;
-    md_result_t *result;
+    md_result_t *result = NULL;
     apr_status_t rv;
     
     md_job_load(job);
@@ -151,7 +151,7 @@ expiry:
     }
 
 leave:
-    if (job->dirty) {
+    if (job->dirty && result) {
         rv = md_job_save(job, result, ptemp);
         ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, dctx->s, "%s: saving job props", job->mdomain);
     }