diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-07 19:18:50 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-07 19:18:50 +0000 |
| commit | f48883b6ab37867f687aa6279f43da6a56cd40f1 (patch) | |
| tree | ac0e72316d86c2f578943a42491152bb8276e9c5 /net | |
| parent | 2e6fcdb2d0126ddf6dac449d950ffbf5c7c523ba (diff) | |
| parent | d3e7e2f1a7007f79edd38daf0adcf63e4fe950e3 (diff) | |
| download | prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.tar.gz prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.zip | |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppclient_listener.lua | 5 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index c2326a55..e54445b0 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -126,10 +126,7 @@ function xmppclient.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); 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); |