diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-01-31 15:44:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-01-31 15:44:05 +0000 |
| commit | 6ea82b6fd9b16114ca8d2f51143a49ea672002a7 (patch) | |
| tree | debd7e4710d2183d0e34b3612c2323b3639df9d5 /net | |
| parent | 9f2b0935676b3fcb168714f177231305aafbddb6 (diff) | |
| download | prosody-6ea82b6fd9b16114ca8d2f51143a49ea672002a7.tar.gz prosody-6ea82b6fd9b16114ca8d2f51143a49ea672002a7.zip | |
net.connlisteners: Update for new server API, type == 'tls' now means little - all connections support TLS
Diffstat (limited to 'net')
| -rw-r--r-- | net/connlisteners.lua | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/connlisteners.lua b/net/connlisteners.lua index a9b92a8c..99305220 100644 --- a/net/connlisteners.lua +++ b/net/connlisteners.lua @@ -53,14 +53,6 @@ function start(name, udata) error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0); end - if udata then - if (udata.type == "ssl" or udata.type == "tls") and not udata.ssl then - error("No SSL context supplied for a "..tostring(udata.type):upper().." connection!", 0); - elseif udata.ssl and udata.type == "tcp" then - error("SSL context supplied for a TCP connection!", 0); - end - end - local interface = (udata and udata.interface) or h.default_interface or "*"; local port = (udata and udata.port) or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0); local mode = (udata and udata.mode) or h.default_mode or 1; @@ -68,7 +60,7 @@ function start(name, udata) local maxclients = 99999999; local autossl = udata and udata.type == "ssl"; - return server.addserver(interface, port, h, mode, ssl, autossl); + return server.addserver(interface, port, h, mode, autossl and ssl or nil); end return _M; |