October 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.5] Fix compilation on systems with older compilers.
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jun 10 20:04:13 2021 +0000 Fix compilation on systems with older compilers. This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization. See: tpo/core/tor#40410 --- changes/ticket40410 | 4 ++++ 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 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,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,

1 0

[tor/main] Fix compilation on systems with older compilers.
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jun 10 20:04:13 2021 +0000 Fix compilation on systems with older compilers. This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization. See: tpo/core/tor#40410 --- changes/ticket40410 | 4 ++++ 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 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,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,

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 489c852da07a1e0c3071e24d4f62f4a4d2e8a749 Merge: a543657f34 89073bda5f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 10:38:20 2021 -0400 Merge branch 'maint-0.4.6'

1 0

[tor/maint-0.4.6] Fix compilation on systems with older compilers.
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jun 10 20:04:13 2021 +0000 Fix compilation on systems with older compilers. This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization. See: tpo/core/tor#40410 --- changes/ticket40410 | 4 ++++ 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 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,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,

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 89073bda5f6eb372e571e229e8864bff723d8350 Merge: fa405ca27f 31fa3cc1a0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 10:38:20 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 676381940e340f284488efc43c8c3e63e006ea37 Merge: d4f68f1c69 89073bda5f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 10:38:20 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6

1 0

[tor/release-0.4.6] Fix compilation on systems with older compilers.
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jun 10 20:04:13 2021 +0000 Fix compilation on systems with older compilers. This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization. See: tpo/core/tor#40410 --- changes/ticket40410 | 4 ++++ 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 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,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,

1 0

[tor/release-0.4.5] Fix compilation on systems with older compilers.
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jun 10 20:04:13 2021 +0000 Fix compilation on systems with older compilers. This patch fixes a build error with GCC 7.x which doesn't seem to accept const int's as constants in macro initialization. See: tpo/core/tor#40410 --- changes/ticket40410 | 4 ++++ 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 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,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,

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit f0678b37ed55b34c513d719387bdcea6c8ee958d Merge: fb2b8339cb 31fa3cc1a0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 10:38:20 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40410 | 4 ++++ src/feature/dirclient/dirclient.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 89073bda5f6eb372e571e229e8864bff723d8350 Merge: fa405ca27f 31fa3cc1a0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 10:38:20 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0