From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 20 Nov 2018 08:34:35 +0000 (+0100)
Subject: MINOR: stream-int: Notify caller when an error is reported after a rcv_buf()
X-Git-Tag: v1.9-dev8~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4acd5e4710f631712cc6f913d4a3292af703385;p=thirdparty%2Fhaproxy.git

MINOR: stream-int: Notify caller when an error is reported after a rcv_buf()

For the same reason than for the commit b46784b1c ("MINOR: stream-int: Notify
caller when an error is reported after a rcv_pipe()"), we return 1 after the
call to rcv_buf() in si_cs_send() to notify the caller some processing may be
triggered.

This patch is not flagged as a bug because no strange behaviour was yet observed
without it. It is just a proactive fix to be consistent.
---

diff --git a/src/stream_interface.c b/src/stream_interface.c
index cf3f9d2ef8..017d1ef317 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -678,6 +678,9 @@ int si_cs_send(struct conn_stream *cs)
 			 * system buffers are full, we will try next time.
 			 */
 		}
+
+		if (conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR)
+			return 1;
 	}
  end:
 	/* We couldn't send all of our data, let the mux know we'd like to send more */