From 7dfac00cffc08f62ca827c5fae1f04cb3920d625 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 23 Jul 2009 01:57:09 +0100 Subject: net.server: Set sslctx to false when SSL wrapping fails, to avoid attempting to wrap clients with a broken context --- net/server.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'net') diff --git a/net/server.lua b/net/server.lua index e31333e2..b0e0eb78 100644 --- a/net/server.lua +++ b/net/server.lua @@ -189,6 +189,7 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco end end if not ssl then + sslctx = false; out_put("server.lua: ", "ssl not enabled on ", serverport); end -- cgit v1.2.3 From 70f4cd7cb7da874196044c896d338b9dcda60e7b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 23 Jul 2009 03:06:49 +0100 Subject: net.server: Remove listener from listeners table when calling removeserver --- net/server.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'net') diff --git a/net/server.lua b/net/server.lua index b0e0eb78..6ff39926 100644 --- a/net/server.lua +++ b/net/server.lua @@ -690,6 +690,7 @@ removeserver = function( port ) return nil, "no server found on port '" .. tostring( port ) "'" end handler.close( ) + _server[ port ] = nil return true end -- cgit v1.2.3 From 23a10d0390865c0e359e3a2e8faa53bd332a2941 Mon Sep 17 00:00:00 2001 From: Matthias Diene Date: Thu, 23 Jul 2009 12:01:00 +0100 Subject: net.server: Fail to open port if legacy SSL requested, but SSL not available --- net/server.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'net') diff --git a/net/server.lua b/net/server.lua index 6ff39926..6fe72712 100644 --- a/net/server.lua +++ b/net/server.lua @@ -190,7 +190,12 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco end if not ssl then sslctx = false; - out_put("server.lua: ", "ssl not enabled on ", serverport); + if startssl then + out_error( "server.lua: Cannot start ssl on port: ", serverport ) + return nil, "Cannot start ssl, see log for details" + else + out_put("server.lua: ", "ssl not enabled on ", serverport); + end end local accept = socket.accept -- cgit v1.2.3