Mercurial > prosody-hg
comparison net/xmppserver_listener.lua @ 600:2255a2e84ddc
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 07 Dec 2008 19:18:50 +0000 |
| parents | 2538912d94ba |
| children | b6a31e97d018 |
comparison
equal
deleted
inserted
replaced
| 599:30655c5cc531 | 600:2255a2e84ddc |
|---|---|
| 127 session.reset_stream = session_reset_stream; | 127 session.reset_stream = session_reset_stream; |
| 128 session.close = session_close; | 128 session.close = session_close; |
| 129 | 129 |
| 130 session_reset_stream(session); -- Initialise, ready for use | 130 session_reset_stream(session); -- Initialise, ready for use |
| 131 | 131 |
| 132 -- Debug version -- | 132 session.stanza_dispatch = stream_callbacks.handlestanza; |
| 133 -- local function handleerr(err) print("Traceback:", err, debug.traceback()); end | |
| 134 -- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end | |
| 135 end | 133 end |
| 136 if data then | 134 if data then |
| 137 session.data(conn, data); | 135 session.data(conn, data); |
| 138 end | 136 end |
| 139 end | 137 end |