BUG/MINOR: mux-fcgi: fix the "show fd" dest buffer for the subscriber
Commit 1776ffb97 ("MINOR: mux-fcgi: make the "show fd" helper also decode
the fstrm subscriber when known") improved the output of "show fd" for the
FCGI mux, but the output is sent to the trash buffer instead of the msg
argument. It turns out that this has no effect right now as the caller
passes the trash but this is risky.
This should be backported to 2.4.
(cherry picked from commit 410546145b58adc035c357fb89163ced4fb84829)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit b716db161d36f02ad6ded6865a336efa1d4ae913)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 005a506cb66d2578d87eab2c6750255ea1d7c1af)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index d916496..83c57a4 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -4184,14 +4184,14 @@
if (fstrm->cs)
chunk_appendf(msg, " .cs.flg=0x%08x .cs.data=%p",
fstrm->cs->flags, fstrm->cs->data);
- chunk_appendf(&trash, " .subs=%p", fstrm->subs);
+ chunk_appendf(msg, " .subs=%p", fstrm->subs);
if (fstrm->subs) {
- chunk_appendf(&trash, "(ev=%d tl=%p", fstrm->subs->events, fstrm->subs->tasklet);
- chunk_appendf(&trash, " tl.calls=%d tl.ctx=%p tl.fct=",
+ chunk_appendf(msg, "(ev=%d tl=%p", fstrm->subs->events, fstrm->subs->tasklet);
+ chunk_appendf(msg, " tl.calls=%d tl.ctx=%p tl.fct=",
fstrm->subs->tasklet->calls,
fstrm->subs->tasklet->context);
- resolve_sym_name(&trash, NULL, fstrm->subs->tasklet->process);
- chunk_appendf(&trash, ")");
+ resolve_sym_name(msg, NULL, fstrm->subs->tasklet->process);
+ chunk_appendf(msg, ")");
}
}
return 0;