Merge with 0.4

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index b2b19c70992375fea4c7e293ff422876cbee058d..9e42b8ff8006fe2d9b5d7c991b71dae905a4c20e 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -791,7 +791,7 @@ local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx,
 end\r
 \r
 local addclient = function( address, port, listeners, pattern, sslctx, startssl )\r
-    local client, err = socket.tcp( )\r
+    local client, err = luasocket.tcp( )\r
     if err then\r
         return nil, err\r
     end\r
@@ -800,7 +800,7 @@ local addclient = function( address, port, listeners, pattern, sslctx, startssl
     if err then    -- try again\r
         local handler = wrapclient( client, address, port, listeners )\r
     else\r
-        wrapconnection( server, listeners, socket, address, port, "clientport", pattern, sslctx, startssl )\r
+        wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx, startssl )\r
     end\r
 end\r
 \r