diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-06-02 21:34:16 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-06-02 21:34:16 +0100 |
| commit | 27ecf036809bda70b9d279b2bd94a2e7e40dd9c0 (patch) | |
| tree | b671d41b5b0f100f4c0ae486e603143bb97338f9 | |
| parent | 20cfa07081574070996c626b907644cbf4d37fc2 (diff) | |
| parent | 3883d8dd070143268b1cb6e9cf09797f3d9868cd (diff) | |
| download | prosody-27ecf036809bda70b9d279b2bd94a2e7e40dd9c0.tar.gz prosody-27ecf036809bda70b9d279b2bd94a2e7e40dd9c0.zip | |
Merge 0.7->trunk
| -rw-r--r-- | net/server_event.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 43e70a0f..b286e8c2 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -750,7 +750,7 @@ do 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 |