Skip to content

Commit

Permalink
*) mod_md: update to version 2.4.29
Browse files Browse the repository at this point in the history
     - 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
  • Loading branch information
icing committed Dec 3, 2024
1 parent 77a8be7 commit cae775f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
5 changes: 5 additions & 0 deletions changes-entries/md_v2.4.29.txt
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 1 addition & 2 deletions modules/md/md_acme_authz.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions modules/md/md_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/md/mod_md_status.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit cae775f

Please sign in to comment.