Merge with trunk

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 230d92a454fd35b868b0590a421e8c05c1de1869..a9b92a8c81a47a2ce1957a8fbe7267f00aee55d9 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -61,9 +61,14 @@ function start(name, udata)
                end
        end
        
-       return server.addserver(h, 
-                       (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), 
-                               (udata and udata.interface) or h.default_interface or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil, 99999999, udata and udata.type == "ssl");
+       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;
+       local ssl = (udata and udata.ssl) or nil;
+       local maxclients = 99999999;
+       local autossl = udata and udata.type == "ssl";
+       
+       return server.addserver(interface, port, h, mode, ssl, autossl);
 end
 
 return _M;