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 c9f73614cd5d3bef60cebdbb8d41c9a278dec81b..57c32a2bfbc728a1fa90d0cb8acdbd0374d457c8 100644 (file)
--- 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 f99b8865d8728d4559828e5242dad63d1e66ace1..4f494b3eff6b67148aa0e7d3de48031bbe090d66 100644 (file)
--- 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 e9f9463d7135c9fe49765fd9cc2eded591dd64c4..d7ebed23b66ad27c17d869a094b91447747582fc 100644 (file)
--- 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 670c7e79102887f56600febe0d3e3d077cb16e12..31fdc272251b0362b2dc243b2836c661d87d6f9a 100644 (file)
--- 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) {