From: Willy Tarreau <w@1wt.eu>
Date: Thu, 7 Feb 2019 13:48:24 +0000 (+0100)
Subject: BUG/MINOR: lua: initialize the correct idle conn lists for the SSL sockets
X-Git-Tag: v2.0-dev1~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b784b35ce88842c3b7630085775fdd6e5f858bc8;p=thirdparty%2Fhaproxy.git

BUG/MINOR: lua: initialize the correct idle conn lists for the SSL sockets

Commit 40a007cf2 ("MEDIUM: threads/server: Make connection list
(priv/idle/safe) thread-safe") made a copy-paste error when initializing
the Lua sockets, as the TCP one was initialized twice. Fortunately it has
no impact because the pointers are set to NULL after a memset(0) and are
not changed in between.

This must be backported to 1.9 and 1.8.
---

diff --git a/src/hlua.c b/src/hlua.c
index b9df9265fb..3d09d27abf 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -8892,9 +8892,9 @@ void hlua_init(void)
 	socket_ssl.obj_type = OBJ_TYPE_SERVER;
 	LIST_INIT(&socket_ssl.actconns);
 	socket_ssl.pendconns = EB_ROOT;
-	socket_tcp.priv_conns = NULL;
-	socket_tcp.idle_conns = NULL;
-	socket_tcp.safe_conns = NULL;
+	socket_ssl.priv_conns = NULL;
+	socket_ssl.idle_conns = NULL;
+	socket_ssl.safe_conns = NULL;
 	socket_ssl.next_state = SRV_ST_RUNNING; /* early server setup */
 	socket_ssl.last_change = 0;
 	socket_ssl.id = "LUA-SSL-CONN";