diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-06-18 14:29:15 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-06-18 14:29:15 -0400 |
| commit | 3abb9180cb3ff91153b34cb7c5db80421b2b9751 (patch) | |
| tree | 8a9f56f6f7069df63d4448ce698198414d5e6b1e | |
| parent | e18bf39e66eef181be5fa054d6a1bf806242fde6 (diff) | |
| parent | 2c00ad36cd6808423821fc32a072a7f16e8509e5 (diff) | |
| download | tor-3abb9180cb3ff91153b34cb7c5db80421b2b9751.tar.gz tor-3abb9180cb3ff91153b34cb7c5db80421b2b9751.zip | |
Merge branch 'maint-0.4.6' into release-0.4.6
| -rw-r--r-- | changes/ticket40410 | 4 | ||||
| -rw-r--r-- | src/feature/dirclient/dirclient.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket40410 b/changes/ticket40410 new file mode 100644 index 0000000000..90d6f4be63 --- /dev/null +++ b/changes/ticket40410 @@ -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. diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index 79ec518c25..fd677d33fe 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1873,8 +1873,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, |