X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fserver.lua;h=6fe72712ae26e5f7700ff1275ade476132886f4d;hb=4e16323f2a78a2f20bcd75957f2ada27a5d8b90f;hp=e31333e28ed3088c570d1e80f9eb3c610ac15b45;hpb=c7b3e5c7ecea2f0733e8da7ff8a20a8e1622e350;p=prosody.git

diff --git a/net/server.lua b/net/server.lua
index e31333e2..6fe72712 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -189,7 +189,13 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
         end
     end
     if not ssl then
-      out_put("server.lua: ", "ssl not enabled on ", serverport);
+      sslctx = false;
+      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
@@ -689,6 +695,7 @@ removeserver = function( port )
         return nil, "no server found on port '" .. tostring( port ) "'"
     end
     handler.close( )
+    _server[ port ] = nil
     return true
 end