svn commit: r1922279 - in /httpd/httpd/trunk: changes-entries/md_v2.4.29.txt modules/md/md_acme_authz.c modules/md/md_version.h modules/md/mod_md_status.c

[ic...@apache.org]

Author: icing
Date: Tue Dec  3 09:47:26 2024
New Revision: 1922279

URL: http://svn.apache.org/viewvc?rev=1922279&view=rev
Log:
  *) 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.


Added:
    httpd/httpd/trunk/changes-entries/md_v2.4.29.txt
Modified:
    httpd/httpd/trunk/modules/md/md_acme_authz.c
    httpd/httpd/trunk/modules/md/md_version.h
    httpd/httpd/trunk/modules/md/mod_md_status.c

Added: httpd/httpd/trunk/changes-entries/md_v2.4.29.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/md_v2.4.29.txt?rev=1922279&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/md_v2.4.29.txt (added)
+++ httpd/httpd/trunk/changes-entries/md_v2.4.29.txt Tue Dec  3 09:47:26 2024
@@ -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.

Modified: httpd/httpd/trunk/modules/md/md_acme_authz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_acme_authz.c?rev=1922279&r1=1922278&r2=1922279&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme_authz.c (original)
+++ httpd/httpd/trunk/modules/md/md_acme_authz.c Tue Dec  3 09:47:26 2024
@@ -263,9 +263,8 @@ static apr_status_t cha_http_01_setup(md
     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;
     }
     

Modified: httpd/httpd/trunk/modules/md/md_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_version.h?rev=1922279&r1=1922278&r2=1922279&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_version.h (original)
+++ httpd/httpd/trunk/modules/md/md_version.h Tue Dec  3 09:47:26 2024
@@ -27,7 +27,7 @@
  * @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
@@ -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 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"

Modified: httpd/httpd/trunk/modules/md/mod_md_status.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md_status.c?rev=1922279&r1=1922278&r2=1922279&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md_status.c (original)
+++ httpd/httpd/trunk/modules/md/mod_md_status.c Tue Dec  3 09:47:26 2024
@@ -617,7 +617,7 @@ static void si_val_stapling(status_ctx *
         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);
     }
 }