# HG changeset patch # User Matthew Wild # Date 1275510856 -3600 # Node ID 0005df92d379a2c0b59ed6fe86004e914ed5f676 # Parent a83a995fe5db9476ccfb0f7254bc6caf5167b7dc# Parent 5aca2f01c0f9a83a5aaf2b9d83ec29f622f0e220 Merge 0.7->trunk diff -r a83a995fe5db -r 0005df92d379 net/server_event.lua --- a/net/server_event.lua Wed Jun 02 18:24:56 2010 +0100 +++ b/net/server_event.lua Wed Jun 02 21:34:16 2010 +0100 @@ -750,7 +750,7 @@ function wrapclient( client, ip, port, listeners, pattern, sslctx, startssl ) local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx ) interface:_start_session() - return interface + return interface, client --function handleclient( client, ip, port, server, pattern, listener, _, sslctx ) -- creates an client interface end