BUG/MINOR: mux_h2: missing space between "st" and ".flg" in the "show fd" helper
authorWilly Tarreau <w@1wt.eu>
Wed, 20 Jan 2021 14:50:03 +0000 (15:50 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Tue, 26 Jan 2021 11:09:24 +0000 (12:09 +0100)
That was causing confusing outputs like this one whenan H2S is known:

   1030 : ... last_h2s=0x2ed8390 .id=775 .st=HCR.flg=0x4001 .rxbuf=...
                                                ^^^^

This was introduced by commit ab2ec4540 in 2.1-dev2 so the fix can be
backported as far as 2.1.

(cherry picked from commit ed4464e6c698bfb410610b7f3850cd0fa3331eb1)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 1c694698bc378224165860000f5e41b3301a9be7)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 663c62c31e45eac5b6b0c4b3d4b24d6a8151e5c8)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/mux_h2.c

index ab2ce47..eb03ac9 100644 (file)
@@ -6043,7 +6043,7 @@ static void h2_show_fd(struct buffer *msg, struct connection *conn)
                      (unsigned int)b_head_ofs(tmbuf), (unsigned int)b_size(tmbuf));
 
        if (h2s) {
-               chunk_appendf(msg, " last_h2s=%p .id=%d .st=%s.flg=0x%04x .rxbuf=%u@%p+%u/%u .cs=%p",
+               chunk_appendf(msg, " last_h2s=%p .id=%d .st=%s .flg=0x%04x .rxbuf=%u@%p+%u/%u .cs=%p",
                              h2s, h2s->id, h2s_st_to_str(h2s->st), h2s->flags,
                              (unsigned int)b_data(&h2s->rxbuf), b_orig(&h2s->rxbuf),
                              (unsigned int)b_head_ofs(&h2s->rxbuf), (unsigned int)b_size(&h2s->rxbuf),