Merge /httpd/httpd/trunk:r1930363

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

Author: icing

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.

modules/md/md_version.h

@@ -27,15 +27,15 @@
  * @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
  * Numerical representation of the version number of the md module
  * 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"
 

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;

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);