Merge branch 'maint-0.4.6'

This commit is contained in:
David Goulet 2021-06-18 14:29:15 -04:00
commit 270398fa31
2 changed files with 5 additions and 2 deletions

4
changes/ticket40410 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Fix a compilation error when trying to build Tor with a compiler that
does not support expanding statitically initialized const values in
macro's. Fixes bug 40410; bugfix on 0.4.6.5.

View File

@ -1907,8 +1907,7 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp,
/* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
if (!plausible && !new_body) {
const int LOG_INTERVAL = 3600;
static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,