From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 18 Jan 2019 16:25:29 +0000 (+0100)
Subject: MINOR: muxes: Don't bother to LIST_DEL(&conn->list) before calling conn_free().
X-Git-Tag: v2.0-dev1~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c9da5ee89272282ea64341e856d1ece1367e737;p=thirdparty%2Fhaproxy.git

MINOR: muxes: Don't bother to LIST_DEL(&conn->list) before calling conn_free().

conn_free() already removes the connection from any idle list, so there's no
need to do it in the mux code, just before calling conn_free().
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index ead67e06e2..3fe6f95cc0 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -443,8 +443,6 @@ static void h1_release(struct connection *conn)
 {
 	struct h1c *h1c = conn->ctx;
 
-	LIST_DEL(&conn->list);
-
 	if (h1c) {
 		if (!LIST_ISEMPTY(&h1c->buf_wait.list)) {
 			HA_SPIN_LOCK(BUF_WQ_LOCK, &buffer_wq_lock);
diff --git a/src/mux_h2.c b/src/mux_h2.c
index fabbe1c848..5fdaadf500 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -600,8 +600,6 @@ static void h2_release(struct connection *conn)
 {
 	struct h2c *h2c = conn->ctx;
 
-	LIST_DEL(&conn->list);
-
 	if (h2c) {
 		hpack_dht_free(h2c->ddht);
 
diff --git a/src/mux_pt.c b/src/mux_pt.c
index 462a7593aa..4f53920c41 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -28,7 +28,6 @@ static void mux_pt_destroy(struct mux_pt_ctx *ctx)
 {
 	struct connection *conn = ctx->conn;
 
-	LIST_DEL(&conn->list);
 	conn_stop_tracking(conn);
 	conn_full_close(conn);
 	tasklet_free(ctx->wait_event.task);