projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ejabberdsql2prosody: Allow for multiple INSERTs to the same table
[prosody.git]
/
net
/
server.lua
diff --git
a/net/server.lua
b/net/server.lua
index e31333e28ed3088c570d1e80f9eb3c610ac15b45..6fe72712ae26e5f7700ff1275ade476132886f4d 100644
(file)
--- a/
net/server.lua
+++ b/
net/server.lua
@@
-189,7
+189,13
@@
wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
end
\r
end
\r
if not ssl then
\r
end
\r
end
\r
if not ssl then
\r
- out_put("server.lua: ", "ssl not enabled on ", serverport);
\r
+ sslctx = false;
\r
+ if startssl then
\r
+ out_error( "server.lua: Cannot start ssl on port: ", serverport )
\r
+ return nil, "Cannot start ssl, see log for details"
\r
+ else
\r
+ out_put("server.lua: ", "ssl not enabled on ", serverport);
\r
+ end
\r
end
\r
\r
local accept = socket.accept
\r
end
\r
\r
local accept = socket.accept
\r
@@
-689,6
+695,7
@@
removeserver = function( port )
return nil, "no server found on port '" .. tostring( port ) "'"
\r
end
\r
handler.close( )
\r
return nil, "no server found on port '" .. tostring( port ) "'"
\r
end
\r
handler.close( )
\r
+ _server[ port ] = nil
\r
return true
\r
end
\r
\r
return true
\r
end
\r
\r