From: Stefan Eissing <icing@apache.org>
Date: Thu, 11 Jul 2019 11:06:48 +0000 (+0000)
Subject: mod_md v2.0.8: synching wiht github release.
X-Git-Tag: 2.4.40~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f8c2fd56afbb8d5489f2d6088b7b9c8ecc79dd8;p=thirdparty%2Fapache%2Fhttpd.git

mod_md v2.0.8: synching wiht github release.


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

diff --git a/modules/md/md.h b/modules/md/md.h
index a2d874551a9..f617dd31dbb 100644
--- a/modules/md/md.h
+++ b/modules/md/md.h
@@ -29,8 +29,6 @@ struct md_store_t;
 struct md_srv_conf_t;
 struct md_pkey_spec_t;
 
-#define MD_TLSSNI01_DNS_SUFFIX     ".acme.invalid"
-
 #define MD_PKEY_RSA_BITS_MIN       2048
 #define MD_PKEY_RSA_BITS_DEF       2048
 
diff --git a/modules/md/md_acme_acct.c b/modules/md/md_acme_acct.c
index 0f55ab258f4..e1e36dfff8e 100644
--- a/modules/md/md_acme_acct.c
+++ b/modules/md/md_acme_acct.c
@@ -443,7 +443,7 @@ static apr_status_t acct_upd(md_acme_t *acme, apr_pool_t *p,
     }
     
     apr_array_clear(acct->contacts);
-    md_json_getsa(acct->contacts, body, MD_KEY_CONTACT, NULL);
+    md_json_dupsa(acct->contacts, acme->p, body, MD_KEY_CONTACT, NULL);
     if (md_json_has_key(body, MD_KEY_STATUS, NULL)) {
         acct->status = acct_st_from_str(md_json_gets(body, MD_KEY_STATUS, NULL));
     }
diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index 21286a26161..e9f9463d713 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.7"
+#define MOD_MD_VERSION "2.0.8"
 
 /**
  * @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 0x020007
+#define MOD_MD_VERSION_NUM 0x020008
 
 #define MD_ACME_DEF_URL    "https://acme-v02.api.letsencrypt.org/directory"
 
diff --git a/modules/md/mod_md_config.c b/modules/md/mod_md_config.c
index ba79fd773a2..ffb09470db9 100644
--- a/modules/md/mod_md_config.c
+++ b/modules/md/mod_md_config.c
@@ -45,7 +45,7 @@
 static md_mod_conf_t defmc = {
     NULL,                      /* list of mds */
 #if AP_MODULE_MAGIC_AT_LEAST(20180906, 2)
-    NULL,                      /* base dirm by default state-dir-relative */
+    NULL,                      /* base dir by default state-dir-relative */
 #else
     MD_DEFAULT_BASE_DIR,
 #endif
@@ -898,6 +898,12 @@ apr_status_t md_config_post_config(server_rec *s, apr_pool_t *p)
         mc->hsts_header = apr_psprintf(p, "max-age=%d", mc->hsts_max_age);
     }
     
+#if AP_MODULE_MAGIC_AT_LEAST(20180906, 2)
+    if (mc->base_dir == NULL) {
+        mc->base_dir = ap_state_dir_relative(p, MD_DEFAULT_BASE_DIR);
+    }
+#endif
+    
     return APR_SUCCESS;
 }