Merge of /httpd/httpd/trunk:r1931951

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

Author: icing

changes-entries/md_v2.6.8.txt

@@ -0,0 +1,5 @@
+  *) mod_md: update to version 2.6.8
+     - Fix the ARI related `replaces` property in ACME order creation to only
+       be used when the CA supports ARI and it is enabled in the menu config.
+     - Fix compatibility with APR versions before 1.6.0 which do not have
+       `apr_cstr_casecmp` and should use `apr_strnatcasecmp` instead.

modules/md/md_acmev2_drive.c

@@ -78,7 +78,8 @@ static apr_status_t ad_setup_order(md_proto_driver_t *d, md_result_t *result, in
         md_acme_order_purge(d->store, d->p, MD_SG_STAGING, md, d->env);
     }
 
-    if (ad->cred->spec && ad->md->ca_account) {
+    if (ad->cred->spec && ad->md->ca_account && ad->md->ari_renewals &&
+        ad->acme->api.v2.renewal_info) {
         /* are we replacing a previous certificate on the same account? */
         int i;
         for (i = 0; i < md_pkeys_spec_count(d->md->pks); ++i) {

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.7-git"
+#define MOD_MD_VERSION "2.6.8"
 
 /**
  * @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 0x020607
+#define MOD_MD_VERSION_NUM 0x020608
 
 #define MD_ACME_DEF_URL         "https://acme-v02.api.letsencrypt.org/directory"