From d9a2baffabdca2448907b9fdf55017c9a9572906 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Mon, 8 Dec 2025 12:54:34 +0000 Subject: [PATCH] *) mod_md: update to version 2.6.7 - Fix a regression in `MDStapleOthers` which broke in v2.6.0 and no longer applied, no matter the configuration. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1930363 13f79535-47bb-0310-9956-ffa450edef68 --- changes-entries/md_v2.6.7.txt | 3 +++ modules/md/md_version.h | 4 ++-- modules/md/mod_md_config.c | 1 + modules/md/mod_md_ocsp.c | 12 +++++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 changes-entries/md_v2.6.7.txt diff --git a/changes-entries/md_v2.6.7.txt b/changes-entries/md_v2.6.7.txt new file mode 100644 index 00000000000..e48fe83110d --- /dev/null +++ b/changes-entries/md_v2.6.7.txt @@ -0,0 +1,3 @@ + *) mod_md: update to version 2.6.7 + - Fix a regression in `MDStapleOthers` which broke in v2.6.0 and no longer + applied, no matter the configuration. diff --git a/modules/md/md_version.h b/modules/md/md_version.h index f977263dab1..56bfcfee117 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.6.6" +#define MOD_MD_VERSION "2.6.7-git" /** * @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 0x020606 +#define MOD_MD_VERSION_NUM 0x020607 #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 d6807c9caf6..96887145376 100644 --- a/modules/md/mod_md_config.c +++ b/modules/md/mod_md_config.c @@ -282,6 +282,7 @@ static void *md_config_merge(apr_pool_t *pool, void *basev, void *addv) nsc->profile = add->profile? add->profile : base->profile; nsc->profile_mandatory = (add->profile_mandatory != DEF_VAL)? add->profile_mandatory : base->profile_mandatory; nsc->stapling = (add->stapling != DEF_VAL)? add->stapling : base->stapling; + nsc->staple_others = (add->staple_others != DEF_VAL)? add->staple_others : base->staple_others; nsc->ari_renewals = (add->ari_renewals != DEF_VAL)? add->ari_renewals : base->ari_renewals; nsc->dns01_cmd = (add->dns01_cmd)? add->dns01_cmd : base->dns01_cmd; nsc->current = NULL; diff --git a/modules/md/mod_md_ocsp.c b/modules/md/mod_md_ocsp.c index 1d1e2827de0..78d0ace5e17 100644 --- a/modules/md/mod_md_ocsp.c +++ b/modules/md/mod_md_ocsp.c @@ -61,8 +61,18 @@ int md_ocsp_prime_status(server_rec *s, apr_pool_t *p, apr_array_header_t *chain; apr_status_t rv = APR_ENOENT; + ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, s, "ocsp prime status call for: %s", + s->server_hostname); sc = md_config_get(s); - if (!staple_here(sc)) goto cleanup; + if (!staple_here(sc)) { + ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, s, + "ocsp prime does not apply here: server=%s, sc=%d" + "ocsp=%d, conf-ocsp=%d conf-others=%d", + s->server_hostname, !!sc, sc? !!sc->mc->ocsp : 0, + md_config_geti(sc, MD_CONFIG_STAPLING), + md_config_geti(sc, MD_CONFIG_STAPLE_OTHERS)); + goto cleanup; + } md = ((sc->assigned && sc->assigned->nelts == 1)? APR_ARRAY_IDX(sc->assigned, 0, const md_t*) : NULL); -- 2.47.3