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

MINOR: proxy: 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 proxy part.
---

diff --git a/src/proxy.c b/src/proxy.c
index a130e00f89..c392b4c6c9 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -2265,12 +2265,12 @@ int stream_set_backend(struct stream *s, struct proxy *be)
 	proxy_inc_be_ctr(be);
 
 	/* assign new parameters to the stream from the new backend */
-	s->si[1].flags &= ~SI_FL_INDEP_STR;
+	cs_si(s->csb)->flags &= ~SI_FL_INDEP_STR;
 	if (be->options2 & PR_O2_INDEPSTR)
-		s->si[1].flags |= SI_FL_INDEP_STR;
+		cs_si(s->csb)->flags |= SI_FL_INDEP_STR;
 
 	if (tick_isset(be->timeout.serverfin))
-		s->si[1].hcto = be->timeout.serverfin;
+		cs_si(s->csb)->hcto = be->timeout.serverfin;
 
 	/* We want to enable the backend-specific analysers except those which
 	 * were already run as part of the frontend/listener. Note that it would