diff options
author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
commit | 1929113b7830954ae60ad49934b3c16bf746a9ba (patch) | |
tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /util/xmppstream.lua | |
parent | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff) | |
parent | 5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff) | |
download | prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip |
Merge 0.9->trunk
Diffstat (limited to 'util/xmppstream.lua')
-rw-r--r-- | util/xmppstream.lua | 2 |
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; |