From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 19 Nov 2018 21:02:07 +0000 (+0100)
Subject: MINOR: stream-int: Notify caller when an error is reported after a rcv_pipe()
X-Git-Tag: v1.9-dev8~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ed7aab68a6bec67f7fc76459eaf237e3428b094;p=thirdparty%2Fhaproxy.git

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

In si_cs_send(), when an error is found on the CS or the connection at the
beginning of the function, we return 1 to notify the caller some processing may
be triggered. So, it seems logical to do the same after the call to rcv_pipe().

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 1f82959523..cf3f9d2ef8 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -625,7 +625,7 @@ int si_cs_send(struct conn_stream *cs)
 		}
 
 		if (conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR)
-			return 0;
+			return 1;
 	}
 
 	/* At this point, the pipe is empty, but we may still have data pending