From: Frederic Lecaille Date: Mon, 31 Aug 2026 08:35:16 +0000 (+0200) Subject: MINOR: mux-fcgi: also skip sc_opposite() for haload streams X-Git-Tag: v3.5-dev6~29 X-Git-Url: https://git.kaiwu.me/?a=commitdiff_plain;h=70a1297b2a8c841c932890755bb316478d0ea867;p=haproxy.git MINOR: mux-fcgi: also skip sc_opposite() for haload streams fcgi_set_default_param() already falls back to conn_src()/conn_dst() for check streams (struct check, sc_check()). haload streams (struct hldstream, sc_hldstream()) need the same fallback. This is a preparation for the FCGI support into haload. --- diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index 94995bca3..9b5a20e09 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -1197,8 +1197,9 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst struct fcgi_strm_params *params) { struct connection *cli_conn = objt_conn(fstrm->sess->origin); - const struct sockaddr_storage *src = (sc_check(fcgi_strm_sc(fstrm)) ? conn_src(fconn->conn) : sc_src(sc_opposite(fcgi_strm_sc(fstrm)))); - const struct sockaddr_storage *dst = (sc_check(fcgi_strm_sc(fstrm)) ? conn_dst(fconn->conn) : sc_dst(sc_opposite(fcgi_strm_sc(fstrm)))); + int no_strm = sc_check(fcgi_strm_sc(fstrm)) || sc_hldstream(fcgi_strm_sc(fstrm)); + const struct sockaddr_storage *src = (no_strm ? conn_src(fconn->conn) : sc_src(sc_opposite(fcgi_strm_sc(fstrm)))); + const struct sockaddr_storage *dst = (no_strm ? conn_dst(fconn->conn) : sc_dst(sc_opposite(fcgi_strm_sc(fstrm)))); struct ist p; if (!sl)