From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 4 Jan 2019 14:16:06 +0000 (+0100)
Subject: MINOR: mux-h1: Add the subscription events in "show fd" command
X-Git-Tag: v2.0-dev1~268
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f376a31562166e52b7810f28ccea6f80d83f1a40;p=thirdparty%2Fhaproxy.git

MINOR: mux-h1: Add the subscription events in "show fd" command

It could be helpful to debug frozen connections.

The patch may be backported to 1.9.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index bdce6dc7f3..4658e48a8b 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -2314,8 +2314,8 @@ static void h1_show_fd(struct buffer *msg, struct connection *conn)
 	struct h1c *h1c = conn->ctx;
 	struct h1s *h1s = h1c->h1s;
 
-	chunk_appendf(msg, " h1c.flg=0x%x .ibuf=%u@%p+%u/%u .obuf=%u@%p+%u/%u",
-		      h1c->flags,
+	chunk_appendf(msg, " h1c.flg=0x%x .sub=%d .ibuf=%u@%p+%u/%u .obuf=%u@%p+%u/%u",
+		      h1c->flags,  h1c->wait_event.events,
 		      (unsigned int)b_data(&h1c->ibuf), b_orig(&h1c->ibuf),
 		      (unsigned int)b_head_ofs(&h1c->ibuf), (unsigned int)b_size(&h1c->ibuf),
 		       (unsigned int)b_data(&h1c->obuf), b_orig(&h1c->obuf),