From: Willy Tarreau Date: Wed, 25 Oct 2023 09:43:01 +0000 (+0200) Subject: DEBUG: mux-h2/flags: fix list of h2c flags used by the flags decoder X-Git-Tag: v2.9-dev9~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55d2fc0c02103841725354cbba97d33f73c6ff4e;p=thirdparty%2Fhaproxy.git DEBUG: mux-h2/flags: fix list of h2c flags used by the flags decoder The two recent commits below each added one flag to h2c but omitted to update the __APPEND_FLAG macro used by dev/flags so they are not properly decoded: 3dd963b35 ("BUG/MINOR: mux-h2: fix http-request and http-keep-alive timeouts again") 68d02e5fa ("BUG/MINOR: mux-h2: make up other blocked streams upon removal from list") This can be backported along with these commits. --- diff --git a/include/haproxy/mux_h2-t.h b/include/haproxy/mux_h2-t.h index 2d5b1eeb72..ccb40b2e24 100644 --- a/include/haproxy/mux_h2-t.h +++ b/include/haproxy/mux_h2-t.h @@ -81,13 +81,13 @@ static forceinline char *h2c_show_flags(char *buf, size_t len, const char *delim _(0); /* flags */ _(H2_CF_MUX_MALLOC, _(H2_CF_MUX_MFULL, _(H2_CF_DEM_DALLOC, - _(H2_CF_DEM_DFULL, _(H2_CF_DEM_MROOM, + _(H2_CF_DEM_DFULL, _(H2_CF_WAIT_INLIST, _(H2_CF_DEM_MROOM, _(H2_CF_DEM_SALLOC, _(H2_CF_DEM_SFULL, _(H2_CF_DEM_TOOMANY, - _(H2_CF_DEM_SHORT_READ, _(H2_CF_DEM_IN_PROGRESS, _(H2_CF_GOAWAY_SENT, - _(H2_CF_GOAWAY_FAILED, _(H2_CF_WAIT_FOR_HS, _(H2_CF_IS_BACK, + _(H2_CF_DEM_SHORT_READ, _(H2_CF_DEM_IN_PROGRESS, _(H2_CF_MBUF_HAS_DATA, + _(H2_CF_GOAWAY_SENT, _(H2_CF_GOAWAY_FAILED, _(H2_CF_WAIT_FOR_HS, _(H2_CF_IS_BACK, _(H2_CF_WINDOW_OPENED, _(H2_CF_RCVD_SHUT, _(H2_CF_END_REACHED, _(H2_CF_RCVD_RFC8441, _(H2_CF_SHTS_UPDATED, _(H2_CF_DTSU_EMITTED, - _(H2_CF_ERR_PENDING, _(H2_CF_ERROR)))))))))))))))))))))); + _(H2_CF_ERR_PENDING, _(H2_CF_ERROR)))))))))))))))))))))))); /* epilogue */ _(~0U); return buf;