BUG/MINOR: mworker: do not export HAPROXY_MWORKER_REEXEC across programs
This undocumented variable is only for internal use, and its sole
presence affects the process' behavior, as shown in bug #1324. It must
not be exported to workers, external checks, nor programs. Let's unset
it before forking programs and workers.
This should be backported as far as 1.8. The worker code might differ
a bit before 2.5 due to the recent removal of multi-process support.
diff --git a/src/haproxy.c b/src/haproxy.c
index fd5ef30..5d3d928 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3183,6 +3183,8 @@
exit(1); /* there has been an error */
}
else if (ret == 0) { /* child breaks here */
+ /* This one must not be exported, it's internal! */
+ unsetenv("HAPROXY_MWORKER_REEXEC");
ha_random_jump96(1);
}
else { /* parent here */
diff --git a/src/mworker-prog.c b/src/mworker-prog.c
index 4a64662..9de94a2 100644
--- a/src/mworker-prog.c
+++ b/src/mworker-prog.c
@@ -110,6 +110,8 @@
exit(1);
}
+ /* This one must not be exported, it's internal! */
+ unsetenv("HAPROXY_MWORKER_REEXEC");
execvp(child->command[0], child->command);
ha_alert("Cannot execute %s: %s\n", child->command[0], strerror(errno));