diff options
| author | Stefan Eissing <icing@apache.org> | 2024-12-03 10:47:26 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2024-12-03 10:47:26 +0100 |
| commit | cae775f2f61b2bc3e656b1149b60cf96463dff21 (patch) | |
| tree | fe58b21d0096252fc8b485899bb152b277ff57ff | |
| parent | mod_md test_702_42, make sure that log errors/warning from previous (diff) | |
| download | apache2-cae775f2f61b2bc3e656b1149b60cf96463dff21.tar.xz apache2-cae775f2f61b2bc3e656b1149b60cf96463dff21.zip | |
*) 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/trunk@1922279 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | changes-entries/md_v2.4.29.txt | 5 | ||||
| -rw-r--r-- | modules/md/md_acme_authz.c | 3 | ||||
| -rw-r--r-- | modules/md/md_version.h | 4 | ||||
| -rw-r--r-- | modules/md/mod_md_status.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/changes-entries/md_v2.4.29.txt b/changes-entries/md_v2.4.29.txt new file mode 100644 index 0000000000..09323cd948 --- /dev/null +++ b/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. diff --git a/modules/md/md_acme_authz.c b/modules/md/md_acme_authz.c index f4579b366b..fc46274fff 100644 --- a/modules/md/md_acme_authz.c +++ b/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; } diff --git a/modules/md/md_version.h b/modules/md/md_version.h index 3e2914d6b6..326b74cf25 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.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" diff --git a/modules/md/mod_md_status.c b/modules/md/mod_md_status.c index 6b29256b67..033628f267 100644 --- a/modules/md/mod_md_status.c +++ b/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); } } |