diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-12-07 18:38:22 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-12-07 18:38:22 +0000 |
| commit | 68ba7d6d4344d39c10976d84015ae06463d04be9 (patch) | |
| tree | 677ba87ecd9a4c0b7284838180ebb75e89854f24 | |
| parent | c05e10c03ca2770511f75bc9d8ca8bbc11c204ec (diff) | |
| download | prosody-68ba7d6d4344d39c10976d84015ae06463d04be9.tar.gz prosody-68ba7d6d4344d39c10976d84015ae06463d04be9.zip | |
mod_bosh: Switch to util.xmppstream from xmlhandlers
| -rw-r--r-- | plugins/mod_bosh.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 2ea8e0a0..d346f247 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -10,7 +10,7 @@ module.host = "*" -- Global module local hosts = _G.hosts; local lxp = require "lxp"; -local init_xmlhandlers = require "core.xmlhandlers" +local new_xmpp_stream = require "util.xmppstream".new; local httpserver = require "net.httpserver"; local sm = require "core.sessionmanager"; local sm_destroy_session = sm.destroy_session; @@ -119,9 +119,10 @@ function handle_request(method, body, request) request.log = log; request.on_destroy = on_destroy_request; - local parser = lxp.new(init_xmlhandlers(request, stream_callbacks), "\1"); - - parser:parse(body); + local stream = new_xmpp_stream(request, stream_callbacks); + -- stream:feed() calls the stream_callbacks, so all stanzas in + -- the body are processed in this next line before it returns. + stream:feed(body); local session = sessions[request.sid]; if session then |