From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 6 Sep 2023 07:26:06 +0000 (+0200)
Subject: BUG/MINOR: ring/cli: Don't expect input data when showing events
X-Git-Tag: v2.9-dev5~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=700ca14fc1ff14ddc573620940cf0ac7872c7ab0;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ring/cli: Don't expect input data when showing events

The "show events" command may wait for now events if "-w" option is used. In
this case, no timeout must be triggered. So we explicitly state no input
data are expected. This disables the read timeout on the client side.

This patch should be backported to 2.8. It is probably useless to backport
it further. In all cases, it depends on the commit "BUG/MINOR: applet:
Always expect data when CLI is waiting for a new command"
---

diff --git a/src/ring.c b/src/ring.c
index 7aa5185d47..2b8e3c85e9 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -442,6 +442,8 @@ int cli_io_handler_show_ring(struct appctx *appctx)
 		/* always drain all the request */
 		co_skip(sc_oc(sc), sc_oc(sc)->output);
 	}
+
+	applet_expect_no_data(appctx);
 	return ret;
 }