From 04b4d0f94f75bdcc6338baf129b08c9c6c6ce87e Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Fri, 15 Feb 2019 10:09:53 +0000
Subject: * modules/md/mod_md_config.c (md_mod_conf_get): Use
 state-dir-relative   default base_dir.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1853631 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/md/mod_md_config.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'modules/md')

diff --git a/modules/md/mod_md_config.c b/modules/md/mod_md_config.c
index 336a21ba5c..27c61945b1 100644
--- a/modules/md/mod_md_config.c
+++ b/modules/md/mod_md_config.c
@@ -54,10 +54,18 @@
 
 #define DEF_VAL     (-1)
 
+#ifndef MD_DEFAULT_BASE_DIR
+#define MD_DEFAULT_BASE_DIR "md"
+#endif
+
 /* Default settings for the global conf */
 static md_mod_conf_t defmc = {
     NULL,
-    "md",
+#if AP_MODULE_MAGIC_AT_LEAST(20180906, 2)
+    NULL, /* apply default state-dir-relative */
+#else
+    MD_DEFAULT_BASE_DIR,
+#endif
     NULL,
     NULL,
     80,
@@ -113,6 +121,11 @@ static md_mod_conf_t *md_mod_conf_get(apr_pool_t *pool, int create)
         mod_md_config->mds = apr_array_make(pool, 5, sizeof(const md_t *));
         mod_md_config->unused_names = apr_array_make(pool, 5, sizeof(const md_t *));
         
+#if AP_MODULE_MAGIC_AT_LEAST(20180906, 2)
+        mod_md_config->base_dir = ap_state_dir_relative(pool,
+                                                        MD_DEFAULT_BASE_DIR);
+#endif
+
         apr_pool_cleanup_register(pool, NULL, cleanup_mod_config, apr_pool_cleanup_null);
     }
     
-- 
cgit v1.2.3