Software / code / prosody
Comparison
net/xmppserver_listener.lua @ 2951:294c359a05f5
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 30 Mar 2010 19:45:56 +0100 |
| parent | 2925:692b3c6c5bd2 |
| parent | 2950:0250fba6be72 |
| child | 3141:50318ac90394 |
comparison
equal
deleted
inserted
replaced
| 2947:ff7f6668b34f | 2951:294c359a05f5 |
|---|---|
| 48 end | 48 end |
| 49 end | 49 end |
| 50 | 50 |
| 51 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end | 51 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end |
| 52 function stream_callbacks.handlestanza(a, b) | 52 function stream_callbacks.handlestanza(a, b) |
| 53 if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client | |
| 54 b.attr.xmlns = nil; | |
| 55 end | |
| 53 xpcall(function () core_process_stanza(a, b) end, handleerr); | 56 xpcall(function () core_process_stanza(a, b) end, handleerr); |
| 54 end | 57 end |
| 55 | 58 |
| 56 local connlisteners_register = require "net.connlisteners".register; | 59 local connlisteners_register = require "net.connlisteners".register; |
| 57 | 60 |