From 88ed977abb7d1fd8f0cfb41ddf2faadfbf12fd9b Mon Sep 17 00:00:00 2001
From: Matthias Diener <devnull@localhost>
Date: Thu, 23 Jul 2009 01:29:41 +0100
Subject: net.server: Continue to initialise port listener even when SSL errors
 occur

---
 net/server.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/net/server.lua b/net/server.lua
index da65fce2..e31333e2 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -172,22 +172,24 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
     local ssl = false
 
     if sslctx then
+        ssl = true
         if not ssl_newcontext then
-            return nil, "luasec not found"
+            out_error "luasec not found"
+            ssl = false
         end
         if type( sslctx ) ~= "table" then
             out_error "server.lua: wrong server sslctx"
-            return nil, "wrong server sslctx"
+            ssl = false
         end
         sslctx, err = ssl_newcontext( sslctx )
         if not sslctx then
             err = err or "wrong sslctx parameters"
             out_error( "server.lua: ", err )
-            return nil, err
+            ssl = false
         end
-        ssl = true
-    else
-	out_put("server.lua: ", "ssl not enabled on ", serverport);
+    end
+    if not ssl then
+      out_put("server.lua: ", "ssl not enabled on ", serverport);
     end
 
     local accept = socket.accept
-- 
cgit v1.2.3