aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2013-12-18 18:11:17 -0500
committerdaurnimator <quae@daurnimator.com>2013-12-18 18:11:17 -0500
commit03b5e2a257b036b3915d7905682ffef025858a19 (patch)
tree65d1979df3d0b5b567ae4bbad0eab1829ca0e4a2
parenteffb3a25414502e3aa0baad6a4d39d891397e07e (diff)
downloadprosody-03b5e2a257b036b3915d7905682ffef025858a19.tar.gz
prosody-03b5e2a257b036b3915d7905682ffef025858a19.zip
net/server_event: pcall require ssl rather than relying on globals
-rw-r--r--net/server_event.lua22
1 files changed, 7 insertions, 15 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 00c99784..7575044a 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -716,25 +716,17 @@ do
end
local addserver = ( function( )
- return function( addr, port, listener, pattern, sslcfg, startssl ) -- TODO: check arguments
- --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslcfg or "nil", startssl or "nil")
+ return function( addr, port, listener, pattern, sslctx, startssl ) -- TODO: check arguments
+ --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
+ if sslctx and not has_luasec then
+ debug "fatal error: luasec not found"
+ return nil, "luasec not found"
+ end
local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE ) -- create server socket
if not server then
debug( "creating server socket on "..addr.." port "..port.." failed:", err )
return nil, err
end
- local sslctx
- if sslcfg then
- if not has_luasec then
- debug "fatal error: luasec not found"
- return nil, "luasec not found"
- end
- sslctx, err = sslcfg
- if err then
- debug( "error while creating new ssl context for server socket:", err )
- return nil, err
- end
- end
local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl ) -- new server handler
debug( "new server created with id:", tostring(interface))
return interface
@@ -751,7 +743,7 @@ do
end
function addclient( addr, serverport, listener, pattern, sslctx )
- if sslctx and not ssl then
+ if sslctx and not has_luasec then
debug "need luasec, but not available"
return nil, "luasec not found"
end