RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-22 20:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: h1: Don't shutw/shutr the connection if we have keepalive.

Browse Source 
In h1_shutw() and h1_shutr(), don't attempt to shutdown() the connection
if we're using keepalive and the connection has no error, or we will close
the connection too soon.
This commit is contained in:
Olivier Houchard 2018-12-19 15:55:23 +01:00 committed by Willy Tarreau
parent 14bfe9af12
commit d2e88c715d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mux_h1.c
View File

@ -1994,7 +1994,8 @@ static void h1_shutr(struct conn_stream *cs, enum cs_shr_mode mode)
if (!h1s)
return;
if ((h1s->flags & H1S_F_WANT_KAL) && !(cs->flags & (CS_FL_REOS|CS_FL_EOS)))
if ((h1s->flags & H1S_F_WANT_KAL) &&
!(cs->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH)))
return;
/* NOTE: Be sure to handle abort (cf. h2_shutr) */
@ -2018,7 +2019,8 @@ static void h1_shutw(struct conn_stream *cs, enum cs_shw_mode mode)
h1c = h1s->h1c;
if ((h1s->flags & H1S_F_WANT_KAL) &&
!(cs->flags & (CS_FL_REOS|CS_FL_EOS)) &&
!(h1c->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH)) &&
h1s->req.state == H1_MSG_DONE && h1s->res.state == H1_MSG_DONE)
return;