BUG/MEDIUM: stconn: Report error on SC on send if a previous SE error was set

When a send on a connection is performed, if a SE error (or a pending error)
was already reported earlier, we leave immediately. No send is performed.
However, we must be sure to report the error at the SC level if necessary.
Indeed, the SE error may have been reported during the zero-copy data
forwarding. So during receive on the opposite side. In that case, we may
have missed the opportunity to report it at the SC level.

The patch must be backported as far as 2.8.

(cherry picked from commit 5dc45445ff18207dbacebf1f777e1f1abcd5065d)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/stconn.c b/src/stconn.c
index 6077403..536b1a6 100644 (file)
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -1590,6 +1590,8 @@ int sc_conn_send(struct stconn *sc)
                if (sc->state < SC_ST_CON)
                        return 0;
                BUG_ON(sc_ep_test(sc, SE_FL_EOS|SE_FL_ERROR|SE_FL_ERR_PENDING) == (SE_FL_EOS|SE_FL_ERR_PENDING));
+               if (sc_ep_test(sc, SE_FL_ERROR))
+                       sc->flags |= SC_FL_ERROR;
                return 1;
        }