RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 23:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: mux-h1: Handle the flag CS_FL_KILL_CONN during a shutdown read/write

Browse Source 
This flag is used to explicitly kill the connection when the CS is closed. It
may be set by tcp rules. It must be respect by the mux-h1.

This patch must be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-04-08 10:51:20 +02:00
parent 14c91cfdf8
commit 7f36636c21
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mux_h1.c
View File

@ -2079,21 +2079,26 @@ static void h1_detach(struct conn_stream *cs)
static void h1_shutr(struct conn_stream *cs, enum cs_shr_mode mode) static void h1_shutr(struct conn_stream *cs, enum cs_shr_mode mode)
{ {
struct h1s *h1s = cs->ctx; struct h1s *h1s = cs->ctx;
struct h1c *h1c;
if (!h1s) if (!h1s)
return; return;
h1c = h1s->h1c;
if ((h1s->flags & H1S_F_WANT_KAL) && if ((cs->flags & CS_FL_KILL_CONN) || (h1c->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH)))
!(cs->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH))) goto do_shutr;
if (h1s->flags & H1S_F_WANT_KAL)
return; return;
do_shutr:
/* NOTE: Be sure to handle abort (cf. h2_shutr) */ /* NOTE: Be sure to handle abort (cf. h2_shutr) */
if (cs->flags & CS_FL_SHR) if (cs->flags & CS_FL_SHR)
return; return;
if (conn_xprt_ready(cs->conn) && cs->conn->xprt->shutr) if (conn_xprt_ready(cs->conn) && cs->conn->xprt->shutr)
cs->conn->xprt->shutr(cs->conn, (mode == CS_SHR_DRAIN)); cs->conn->xprt->shutr(cs->conn, (mode == CS_SHR_DRAIN));
if ((cs->conn->flags & (CO_FL_SOCK_RD_SH|CO_FL_SOCK_WR_SH)) == (CO_FL_SOCK_RD_SH|CO_FL_SOCK_WR_SH)) if ((cs->conn->flags & (CO_FL_SOCK_RD_SH|CO_FL_SOCK_WR_SH)) == (CO_FL_SOCK_RD_SH|CO_FL_SOCK_WR_SH))
h1s->h1c->flags = (h1s->h1c->flags & ~H1C_F_CS_SHUTW_NOW) | H1C_F_CS_SHUTDOWN; h1c->flags = (h1c->flags & ~H1C_F_CS_SHUTW_NOW) | H1C_F_CS_SHUTDOWN;
} }
static void h1_shutw(struct conn_stream *cs, enum cs_shw_mode mode) static void h1_shutw(struct conn_stream *cs, enum cs_shw_mode mode)
@ -2105,12 +2110,13 @@ static void h1_shutw(struct conn_stream *cs, enum cs_shw_mode mode)
return; return;
h1c = h1s->h1c; h1c = h1s->h1c;
if ((h1s->flags & H1S_F_WANT_KAL) && if ((cs->flags & CS_FL_KILL_CONN) || (h1c->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH)))
!(h1c->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH)) && goto do_shutw;
h1s->req.state == H1_MSG_DONE && h1s->res.state == H1_MSG_DONE) if ((h1s->flags & H1S_F_WANT_KAL) && h1s->req.state == H1_MSG_DONE && h1s->res.state == H1_MSG_DONE)
return; return;
do_shutw:
h1c->flags |= H1C_F_CS_SHUTW_NOW; h1c->flags |= H1C_F_CS_SHUTW_NOW;
if ((cs->flags & CS_FL_SHW) || b_data(&h1c->obuf)) if ((cs->flags & CS_FL_SHW) || b_data(&h1c->obuf))
return; return;