]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: proto_htx: Don't stop forwarding when there is a post-connect processing
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 13 Jun 2019 09:36:17 +0000 (11:36 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 19 Jul 2019 07:18:27 +0000 (09:18 +0200)
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.

src/proto_htx.c

index 9f3a4d9bbd1170b07ce000b2e41281a4c9e4c26a..89e428496a1a7bb303fead2b7000da4637dfd0b7 100644 (file)
@@ -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);