BUG/MINOR: init: set HAPROXY_STARTUP_VERSION from the variable, not the macro

This environment variable was added by commit d4c0be6b20 ("MINOR: startup:
HAPROXY_STARTUP_VERSION contains the version used to start"). However, it's
set from the macro that is passed during the build process instead of being
set from the variable that's kept up to date in version.c. The difference
is visible only during debugging/bisecting because only changed files and
version.o are rebuilt, but not necessarily haproxy.o, which is where the
environment variable is set. This means that the version exposed in the
environment is not necessarily the same as the one presented in
"haproxy -v" during such debugging sessions.

This should be backported to 2.8. It has no impact at all on regularly
built binaries.

diff --git a/src/haproxy.c b/src/haproxy.c
index 91afc25d408b9175024e208bef16b27b65cf0749..52d58e067d80936183c3875a441944a7cc0e89d6 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1303,7 +1303,7 @@ static void init_early(int argc, char **argv)
        char *tmp;
        int len;
 
-       setenv("HAPROXY_STARTUP_VERSION", HAPROXY_VERSION, 0);
+       setenv("HAPROXY_STARTUP_VERSION", haproxy_version, 0);
 
        /* First, let's initialize most global variables */
        totalconn = actconn = listeners = stopping = 0;