aboutsummaryrefslogtreecommitdiffstats
path: root/util/xmppstream.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
committerKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
commit4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (patch)
treea1d3fc24abd3048cb23d45b860640a83baa8c261 /util/xmppstream.lua
parent8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (diff)
parent517296667e0fa74dd441892cf9750101ae31e814 (diff)
downloadprosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.tar.gz
prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.zip
Merge 0.9->trunk
Diffstat (limited to 'util/xmppstream.lua')
-rw-r--r--util/xmppstream.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index f1793b4f..4909678c 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -45,7 +45,7 @@ function new_sax_handlers(session, stream_callbacks)
local cb_streamopened = stream_callbacks.streamopened;
local cb_streamclosed = stream_callbacks.streamclosed;
- local cb_error = stream_callbacks.error or function(session, e) error("XML stream error: "..tostring(e)); end;
+ local cb_error = stream_callbacks.error or function(session, e, stanza) error("XML stream error: "..tostring(e)..(stanza and ": "..tostring(stanza) or ""),2); end;
local cb_handlestanza = stream_callbacks.handlestanza;
local stream_ns = stream_callbacks.stream_ns or xmlns_streams;