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

Revert "BUG/MEDIUM: H1: When upgrading, make sure we don't free the buffer too early."

Browse Source 
This reverts commit 6c7fe5c3700fac7cc945b2b756df30874cbf77a6.

This patch was harmless, but not needed, conn_upgrade_mux_fe() already takes
care of setting the buffer to BUF_NULL.
This commit is contained in:
Olivier Houchard 2019-06-11 14:06:23 +02:00
parent 86fcf6d6cd
commit 45c4437b4a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mux_h1.c
View File

@ -464,18 +464,16 @@ static void h1_release(struct h1c *h1c)
conn = h1c->conn; conn = h1c->conn;
if (conn && h1c->flags & H1C_F_UPG_H2C) { if (conn && h1c->flags & H1C_F_UPG_H2C) {
struct buffer tmpbuf = h1c->ibuf;
h1c->flags &= ~H1C_F_UPG_H2C; h1c->flags &= ~H1C_F_UPG_H2C;
h1c->ibuf = BUF_NULL; if (conn_upgrade_mux_fe(conn, NULL, &h1c->ibuf, ist("h2"), PROTO_MODE_HTX) != -1) {
if (conn_upgrade_mux_fe(conn, NULL, &tmpbuf, ist("h2"), PROTO_MODE_HTX) != -1) {
/* connection successfully upgraded to H2, this /* connection successfully upgraded to H2, this
* mux was already released */ * mux was already released */
return; return;
} }
h1c->ibuf = tmpbuf;
sess_log(conn->owner); /* Log if the upgrade failed */ sess_log(conn->owner); /* Log if the upgrade failed */
} }
if (!LIST_ISEMPTY(&h1c->buf_wait.list)) { if (!LIST_ISEMPTY(&h1c->buf_wait.list)) {
HA_SPIN_LOCK(BUF_WQ_LOCK, &buffer_wq_lock); HA_SPIN_LOCK(BUF_WQ_LOCK, &buffer_wq_lock);
LIST_DEL(&h1c->buf_wait.list); LIST_DEL(&h1c->buf_wait.list);