From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Mon, 18 Nov 2024 16:54:25 +0000 (+0100)
Subject: MINOR: config: show HAPROXY_BRANCH in "show env" output
X-Git-Tag: v3.1-dev14~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7848692c4cb666875477f718e7b89aee69cfba80;p=thirdparty%2Fhaproxy.git

MINOR: config: show HAPROXY_BRANCH in "show env" output

Before this patch HAPROXY_BRANCH was unset just after configuration parsing.
Let's keep it, as it could be used in conditional blocks and some
configuration directives and it's handy to check its runtime value via "show
env".

In master-worker mode, this variable is set to the same value for both
processes.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 43b282bd54..f32d488d09 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1248,7 +1248,6 @@ static int read_cfg(char *progname)
 
 	}
 	/* remove temporary environment variables. */
-	unsetenv("HAPROXY_BRANCH");
 	unsetenv("HAPROXY_HTTP_LOG_FMT");
 	unsetenv("HAPROXY_HTTP_CLF_LOG_FMT");
 	unsetenv("HAPROXY_HTTPS_LOG_FMT");