From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 22 Jan 2020 13:31:21 +0000 (+0100)
Subject: MINOR: global: Set default tune.maxrewrite value during global structure init
X-Git-Tag: v2.2-dev2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=546c4696bbaeccd2e0282fcd2df2cb8d0f72405a;p=thirdparty%2Fhaproxy.git

MINOR: global: Set default tune.maxrewrite value during global structure init

When the global structure is initialized, instead of setting tune.maxrewrite to
-1, its default value can be immediately set. This way, it is always defined
during the configuration validity check. Otherwise, the only way to have it at
this stage, it is to explicity set it in the global section.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 9c578d6d3a..5bca002125 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -163,7 +163,7 @@ struct global global = {
 	.tune = {
 		.options = GTUNE_LISTENER_MQ,
 		.bufsize = (BUFSIZE + 2*sizeof(void *) - 1) & -(2*sizeof(void *)),
-		.maxrewrite = -1,
+		.maxrewrite = MAXREWRITE,
 		.chksize = (BUFSIZE + 2*sizeof(void *) - 1) & -(2*sizeof(void *)),
 		.reserved_bufs = RESERVED_BUFS,
 		.pattern_cache = DEFAULT_PAT_LRU_SIZE,
@@ -2164,9 +2164,6 @@ static void init(int argc, char **argv)
 	if (global.tune.recv_enough == 0)
 		global.tune.recv_enough = MIN_RECV_AT_ONCE_ENOUGH;
 
-	if (global.tune.maxrewrite < 0)
-		global.tune.maxrewrite = MAXREWRITE;
-
 	if (global.tune.maxrewrite >= global.tune.bufsize / 2)
 		global.tune.maxrewrite = global.tune.bufsize / 2;