From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 5 Dec 2016 13:25:08 +0000 (+0100)
Subject: BUG/MINOR: cli: be sure to always warn the cli applet when input buffer is full
X-Git-Tag: v1.8-dev1~290
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90b5abe46ea507ae7831221555f5183d16864d4a;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cli: be sure to always warn the cli applet when input buffer is full

[wt: may only strike if CLI commands are pipelined. Must be backported to 1.7
 and 1.6, where it's a bit different and in dumpstats.c]
---

diff --git a/src/server.c b/src/server.c
index 2f539c9993..479631c8eb 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3536,9 +3536,10 @@ static int cli_parse_get_weight(char **args, struct appctx *appctx, void *privat
 
 	/* return server's effective weight at the moment */
 	snprintf(trash.str, trash.size, "%d (initial %d)\n", sv->uweight, sv->iweight);
-	if (bi_putstr(si_ic(si), trash.str) == -1)
+	if (bi_putstr(si_ic(si), trash.str) == -1) {
 		si_applet_cant_put(si);
-
+		return 0;
+	}
 	return 1;
 }