mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: h1: Make sure we destroy an inactive connectin that did shutw.

Browse Source 
In h1_process(), if we have no associated stream, and the connection got a
shutw, then destroy it, it is unusable and it may be our last chance to do
so.

This should be backported to 1.9.
This commit is contained in:
Olivier Houchard 2019-01-14 17:27:23 +01:00 committed by Willy Tarreau
parent 617d4f5276
commit 32d75ed300
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

@ -1844,7 +1844,7 @@ static int h1_process(struct h1c * h1c)
if (!h1s) { if (!h1s) {
if (h1c->flags & H1C_F_CS_ERROR || if (h1c->flags & H1C_F_CS_ERROR ||
conn->flags & CO_FL_ERROR || conn->flags & (CO_FL_ERROR | CO_FL_SOCK_WR_SH) ||
conn_xprt_read0_pending(conn)) conn_xprt_read0_pending(conn))
goto release; goto release;
if (!conn_is_back(conn) && !(h1c->flags & (H1C_F_CS_SHUTW_NOW|H1C_F_CS_SHUTDOWN))) { if (!conn_is_back(conn) && !(h1c->flags & (H1C_F_CS_SHUTW_NOW|H1C_F_CS_SHUTDOWN))) {
@ -1861,7 +1861,7 @@ static int h1_process(struct h1c * h1c)
if (!b_data(&h1c->ibuf) && h1s && h1s->cs && h1s->cs->data_cb->wake && if (!b_data(&h1c->ibuf) && h1s && h1s->cs && h1s->cs->data_cb->wake &&
(conn_xprt_read0_pending(conn) || h1c->flags & H1C_F_CS_ERROR || (conn_xprt_read0_pending(conn) || h1c->flags & H1C_F_CS_ERROR ||
conn->flags & CO_FL_ERROR)) { conn->flags & (CO_FL_ERROR | CO_FL_SOCK_WR_SH))) {
int flags = 0; int flags = 0;
if (h1c->flags & H1C_F_CS_ERROR || conn->flags & CO_FL_ERROR) if (h1c->flags & H1C_F_CS_ERROR || conn->flags & CO_FL_ERROR)