From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 23 Dec 2021 12:57:00 +0000 (+0100)
Subject: MINOR: http-act: Always access the stream-int via the conn-stream
X-Git-Tag: v2.6-dev2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1ede302c377677f2d5c01d31a8612f82ca11b54;p=thirdparty%2Fhaproxy.git

MINOR: http-act: Always access the stream-int via the conn-stream

To be able to move the stream-interface from the stream to the conn-stream,
all access to the SI is done via the conn-stream. This patch is limited to
the http-act part.
---

diff --git a/src/http_act.c b/src/http_act.c
index fc9306cb8a..b7ec31241a 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -756,7 +756,7 @@ static enum act_parse_ret parse_http_action_reject(const char **args, int *orig_
 static enum act_return http_req_disable_l7_retry(struct act_rule *rule, struct proxy *px,
                                           struct session *sess, struct stream *s, int flags)
 {
-	struct stream_interface *si = &s->si[1];
+	struct stream_interface *si = cs_si(s->csb);
 
 	/* In theory, the SI_FL_L7_RETRY flags isn't set at this point, but
 	 * let's be future-proof and remove it anyway.