aboutsummaryrefslogtreecommitdiffstats
path: root/net/xmppserver_listener.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-07 19:18:50 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-07 19:18:50 +0000
commitf48883b6ab37867f687aa6279f43da6a56cd40f1 (patch)
treeac0e72316d86c2f578943a42491152bb8276e9c5 /net/xmppserver_listener.lua
parent2e6fcdb2d0126ddf6dac449d950ffbf5c7c523ba (diff)
parentd3e7e2f1a7007f79edd38daf0adcf63e4fe950e3 (diff)
downloadprosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.tar.gz
prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net/xmppserver_listener.lua')
-rw-r--r--net/xmppserver_listener.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index e4816b1e..4d2840e7 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -129,9 +129,7 @@ function xmppserver.listener(conn, data)
session_reset_stream(session); -- Initialise, ready for use
- -- Debug version --
--- local function handleerr(err) print("Traceback:", err, debug.traceback()); end
--- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
+ session.stanza_dispatch = stream_callbacks.handlestanza;
end
if data then
session.data(conn, data);