mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-25 07:41:36 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: h1: Destroy a connection after detach if it has no owner.

Browse Source 
Destroy the connection while detaching, even if it has keep alive, if it has
no owner, or nobody else will be able to do so.
This commit is contained in:
Olivier Houchard 2018-12-03 16:33:19 +01:00 committed by Willy Tarreau
parent 2fd45fae46
commit 7ccff1a3d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mux_h1.c
View File

@ -1722,7 +1722,7 @@ static void h1_detach(struct conn_stream *cs)
h1c = h1s->h1c; h1c = h1s->h1c;
h1s->cs = NULL; h1s->cs = NULL;
if (conn_is_back(h1c->conn) && (h1s->flags & H1S_F_WANT_KAL)) { if (conn_is_back(h1c->conn) && (h1s->flags & H1S_F_WANT_KAL) && h1c->conn->owner) {
/* Never ever allow to reuse a connection from a non-reuse backend */ /* Never ever allow to reuse a connection from a non-reuse backend */
if (h1c->conn && (h1c->px->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR) if (h1c->conn && (h1c->px->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR)
h1c->conn->flags |= CO_FL_PRIVATE; h1c->conn->flags |= CO_FL_PRIVATE;
@ -1746,7 +1746,7 @@ static void h1_detach(struct conn_stream *cs)
/* We don't want to close right now unless the connection is in error */ /* We don't want to close right now unless the connection is in error */
if ((h1c->flags & (H1C_F_CS_ERROR|H1C_F_CS_SHUTW)) || if ((h1c->flags & (H1C_F_CS_ERROR|H1C_F_CS_SHUTW)) ||
(h1c->conn->flags & CO_FL_ERROR)) (h1c->conn->flags & CO_FL_ERROR) || !h1c->conn->owner)
h1_release(h1c->conn); h1_release(h1c->conn);
else else
tasklet_wakeup(h1c->wait_event.task); tasklet_wakeup(h1c->wait_event.task);