Software / code / prosody
Diff
util/xmppstream.lua @ 5321:33813f000015
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 03 Feb 2013 15:52:27 +0100 |
| parent | 5311:86fe6e2fa5ae |
| child | 5776:bd0ff8ae98a8 |
| child | 6042:1107d66d2ab2 |
line wrap: on
line diff
--- a/util/xmppstream.lua Tue Jan 22 08:30:38 2013 +0500 +++ b/util/xmppstream.lua Sun Feb 03 15:52:27 2013 +0100 @@ -45,7 +45,7 @@ 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;
