From: Stefan Eissing <icing@apache.org>
Date: Mon, 5 Aug 2019 10:58:44 +0000 (+0000)
Subject: Merged /httpd/httpd/trunk:r1864425
X-Git-Tag: 2.4.41~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f64dd39b1083c2651f79b8b8877c41ff42bfd08;p=thirdparty%2Fapache%2Fhttpd.git

Merged /httpd/httpd/trunk:r1864425

 * mod_md: assigning APLOGNO(), silencing compiler warnings



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864427 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
index c9f73614cd5..57c32a2bfbc 100644
--- a/modules/md/md_crypt.c
+++ b/modules/md/md_crypt.c
@@ -1545,6 +1545,9 @@ apr_status_t md_cert_get_ct_scts(apr_array_header_t *scts, apr_pool_t *p, const
     md_log_perror(MD_LOG_MARK, MD_LOG_TRACE3, 0, p, "ct_sct, found %d SCT extensions", scts->nelts);
     return APR_SUCCESS;
 #else
+    (void)scts;
+    (void)p;
+    (void)cert;
     return APR_ENOTIMPL;
 #endif
 }
diff --git a/modules/md/md_time.c b/modules/md/md_time.c
index f99b8865d87..4f494b3eff6 100644
--- a/modules/md/md_time.c
+++ b/modules/md/md_time.c
@@ -219,7 +219,7 @@ const char *md_timeslice_parse(const md_timeslice_t **pts, apr_pool_t *p,
                                const char *val, apr_interval_time_t norm)
 {
     md_timeslice_t *ts;
-    int percent;
+    int percent = 0;
 
     *pts = NULL;
     if (!val) {
diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index e9f9463d713..d7ebed23b66 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.0.8"
+#define MOD_MD_VERSION "2.0.10"
 
 /**
  * @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 0x020008
+#define MOD_MD_VERSION_NUM 0x02000a
 
 #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 670c7e79102..31fdc272251 100644
--- a/modules/md/mod_md_drive.c
+++ b/modules/md/mod_md_drive.c
@@ -149,7 +149,7 @@ static apr_status_t send_notification(md_drive_ctx *dctx, md_job_t *job, const m
     const char * const *argv;
     const char *cmdline;
     int exit_code;
-    apr_status_t rv;            
+    apr_status_t rv = APR_SUCCESS;            
     
     if (!strcmp("renewed", reason)) {
         if (dctx->mc->notify_cmd) {