RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-08 12:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: mux-h1: always take the endp from the h1s not the cs

Browse Source 
At a few places the endpoint pointer was retrieved from the conn_stream
while it's safer and more long-term proof to take it from the h1s. Let's
just do that.
This commit is contained in:
Willy Tarreau 2022-05-10 10:27:08 +02:00
parent 386346f5eb
commit 61533d3486
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux_h1.c
View File

@ -3481,9 +3481,9 @@ static void h1_shutr(struct conn_stream *cs, enum co_shr_mode mode)
TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s, 0, (size_t[]){mode});
if (cs->endp->flags & CS_EP_SHR)
if (h1s->endp->flags & CS_EP_SHR)
goto end;
if (cs->endp->flags & CS_EP_KILL_CONN) {
if (h1s->endp->flags & CS_EP_KILL_CONN) {
TRACE_STATE("stream wants to kill the connection", H1_EV_STRM_SHUT, h1c->conn, h1s);
goto do_shutr;
}
@ -3504,7 +3504,7 @@ static void h1_shutr(struct conn_stream *cs, enum co_shr_mode mode)
do_shutr:
/* NOTE: Be sure to handle abort (cf. h2_shutr) */
if (cs->endp->flags & CS_EP_SHR)
if (h1s->endp->flags & CS_EP_SHR)
goto end;
if (conn_xprt_ready(h1c->conn) && h1c->conn->xprt->shutr)
@ -3524,9 +3524,9 @@ static void h1_shutw(struct conn_stream *cs, enum co_shw_mode mode)
TRACE_ENTER(H1_EV_STRM_SHUT, h1c->conn, h1s, 0, (size_t[]){mode});
if (cs->endp->flags & CS_EP_SHW)
if (h1s->endp->flags & CS_EP_SHW)
goto end;
if (cs->endp->flags & CS_EP_KILL_CONN) {
if (h1s->endp->flags & CS_EP_KILL_CONN) {
TRACE_STATE("stream wants to kill the connection", H1_EV_STRM_SHUT, h1c->conn, h1s);
goto do_shutw;
}