From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 13 Jun 2019 09:36:17 +0000 (+0200)
Subject: MINOR: proto_htx: Don't stop forwarding when there is a post-connect processing
X-Git-Tag: v2.1-dev2~383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63231df55e5330dc76781b404624ec958d30fd2;p=thirdparty%2Fhaproxy.git

MINOR: proto_htx: Don't stop forwarding when there is a post-connect processing

The TXN flag HTTP_MSGF_WAIT_CONN is now ignored on HTX streams. There is no
reason to not start to forward data in HTX. This is required for the legacy mode
and this was copied from it during the HTX development. But it is simply
useless.
---

diff --git a/src/proto_htx.c b/src/proto_htx.c
index 9f3a4d9bbd..89e428496a 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -1185,20 +1185,6 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
 	if (msg->msg_state == HTTP_MSG_BODY)
 		msg->msg_state = HTTP_MSG_DATA;
 
-	/* Some post-connect processing might want us to refrain from starting to
-	 * forward data. Currently, the only reason for this is "balance url_param"
-	 * whichs need to parse/process the request after we've enabled forwarding.
-	 */
-	if (unlikely(msg->flags & HTTP_MSGF_WAIT_CONN)) {
-		if (!(s->res.flags & CF_READ_ATTACHED)) {
-			channel_auto_connect(req);
-			req->flags |= CF_WAKE_CONNECT;
-			channel_dont_close(req); /* don't fail on early shutr */
-			goto waiting;
-		}
-		msg->flags &= ~HTTP_MSGF_WAIT_CONN;
-	}
-
 	/* in most states, we should abort in case of early close */
 	channel_auto_close(req);