Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Wed, 02 Jun 2010 21:34:16 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 02 Jun 2010 21:34:16 +0100
- changeset 3150
- 0005df92d379
- parent 3148
- a83a995fe5db (current diff)
- parent 3149
- 5aca2f01c0f9 (diff)
- child 3152
- c6091977624b
Merge 0.7->trunk
--- 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
