Merge /httpd/httpd/trunk:r1922279

  *) mod_md: update to version 2.4.29
     - Fixed HTTP-01 challenges to not carry a final newline, as some ACME
       server fail to ignore it. [Michael Kaufmann (@mkauf)]
     - Fixed missing label+newline in server-status plain text output when
       MDStapling is enabled.



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

Author: icing

changes-entries/md_v2.4.29.txt

@@ -0,0 +1,5 @@
+  *) mod_md: update to version 2.4.29
+     - Fixed HTTP-01 challenges to not carry a final newline, as some ACME
+       server fail to ignore it. [Michael Kaufmann (@mkauf)]
+     - Fixed missing label+newline in server-status plain text output when
+       MDStapling is enabled.

modules/md/md_acme_authz.c

@@ -263,9 +263,8 @@ static apr_status_t cha_http_01_setup(md_acme_authz_cha_t *cha, md_acme_authz_t
     rv = md_store_load(store, MD_SG_CHALLENGES, authz->domain, MD_FN_HTTP01,
                        MD_SV_TEXT, (void**)&data, p);
     if ((APR_SUCCESS == rv && strcmp(cha->key_authz, data)) || APR_STATUS_IS_ENOENT(rv)) {
-        const char *content = apr_psprintf(p, "%s\n", cha->key_authz);
         rv = md_store_save(store, p, MD_SG_CHALLENGES, authz->domain, MD_FN_HTTP01,
-                           MD_SV_TEXT, (void*)content, 0);
+                           MD_SV_TEXT, (void*)cha->key_authz, 0);
         notify_server = 1;
     }
 

modules/md/md_version.h

@@ -27,15 +27,15 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "2.4.28"
+#define MOD_MD_VERSION "2.4.29"
 
 /**
  * @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 0x02041c
+#define MOD_MD_VERSION_NUM 0x02041d
 
 #define MD_ACME_DEF_URL         "https://acme-v02.api.letsencrypt.org/directory"
 #define MD_TAILSCALE_DEF_URL    "file://localhost/var/run/tailscale/tailscaled.sock"

modules/md/mod_md_status.c

@@ -617,7 +617,7 @@ static void si_val_stapling(status_ctx *ctx, md_json_t *mdj, const status_info *
         apr_brigade_puts(ctx->bb, NULL, NULL, "on");
     }
     else {
-        apr_brigade_printf(ctx->bb, NULL, NULL, "%s: on", ctx->prefix);
+        apr_brigade_printf(ctx->bb, NULL, NULL, "%sStapling: on\n", ctx->prefix);
     }
 }