aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-23 12:04:41 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-23 12:04:41 +0100
commit351a37ef5437d631d61975160d2b45d4789d0bd9 (patch)
treeeaa4a33315efefdd22884065b404358e4cb2bc1e /net/server.lua
parent5870f3b790f875d3350a5c0d423d55d06b3c67bf (diff)
parent23a10d0390865c0e359e3a2e8faa53bd332a2941 (diff)
downloadprosody-351a37ef5437d631d61975160d2b45d4789d0bd9.tar.gz
prosody-351a37ef5437d631d61975160d2b45d4789d0bd9.zip
Merge with 0.5
Diffstat (limited to 'net/server.lua')
-rw-r--r--net/server.lua9
1 files changed, 8 insertions, 1 deletions
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