From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 12 Jul 2019 13:48:58 +0000 (+0200)
Subject: BUG/MEDIUM: streams: Don't give up if we couldn't send the request.
X-Git-Tag: v2.1-dev1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29cac3c5f7bbac3ae937a91137608d8fd6f73070;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: streams: Don't give up if we couldn't send the request.

In htx_request_forward_body(), don't give up if we failed to send the request,
and we have L7 retries activated. If we do, we will not retry when we should.

This should be backported to 2.0.
---

diff --git a/src/proto_htx.c b/src/proto_htx.c
index d5119c1000..cbe5c84e0c 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -1163,6 +1163,12 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
 		/* Output closed while we were sending data. We must abort and
 		 * wake the other side up.
 		 */
+		/* Don't abort yet if we had L7 retries activated and it
+		 * was a write error, we may recover.
+		 */
+		if (!(req->flags & (CF_READ_ERROR | CF_READ_TIMEOUT)) &&
+		    (s->si[1].flags & SI_FL_L7_RETRY))
+			return 0;
 		msg->err_state = msg->msg_state;
 		msg->msg_state = HTTP_MSG_ERROR;
 		htx_end_request(s);