summaryrefslogtreecommitdiff
path: root/modules/md
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2021-03-24 13:44:10 +0000
committerStefan Eissing <icing@apache.org>2021-03-24 13:44:10 +0000
commit0bc464744b44f182dc0e3276d44a077ec44a1367 (patch)
tree4a885e49008a52b066c83772db7f2e9e5157876c /modules/md
parent4f9956d00913ba6fe94a32d6968822e6a417e44a (diff)
downloadhttpd-0bc464744b44f182dc0e3276d44a077ec44a1367.tar.gz
mod_md: make certain that the post config after ssl part runs really late.
bumped version number. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1888006 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/md')
-rw-r--r--modules/md/md_version.h4
-rw-r--r--modules/md/mod_md.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/md/md_version.h b/modules/md/md_version.h
index 7e25c854a9..e907d4d0d7 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.4.0"
+#define MOD_MD_VERSION "2.4.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 0x020400
+#define MOD_MD_VERSION_NUM 0x020401
#define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory"
diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index 2987d0449c..59098560e9 100644
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -1461,7 +1461,7 @@ static void md_child_init(apr_pool_t *pool, server_rec *s)
*/
static void md_hooks(apr_pool_t *pool)
{
- static const char *const mod_ssl[] = { "mod_ssl.c", NULL};
+ static const char *const mod_ssl[] = { "mod_ssl.c", "mod_tls.c", NULL};
/* Leave the ssl initialization to mod_ssl or friends. */
md_acme_init(pool, AP_SERVER_BASEVERSION, 0);
@@ -1472,7 +1472,7 @@ static void md_hooks(apr_pool_t *pool)
* Run again after mod_ssl is done.
*/
ap_hook_post_config(md_post_config_before_ssl, NULL, mod_ssl, APR_HOOK_MIDDLE);
- ap_hook_post_config(md_post_config_after_ssl, mod_ssl, NULL, APR_HOOK_MIDDLE);
+ ap_hook_post_config(md_post_config_after_ssl, mod_ssl, NULL, APR_HOOK_LAST);
/* Run once after a child process has been created.
*/