diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-06-05 12:28:49 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-06-05 12:28:49 +0100 |
| commit | 16a24fc55fa5027a2d4ae20ce8f086cb9c20849a (patch) | |
| tree | 90d381f9e4087b00fee7952e7ca2dd1c30f91720 | |
| parent | 82639a7fbfbe2aaa3323024260acb029186381a4 (diff) | |
| download | prosody-16a24fc55fa5027a2d4ae20ce8f086cb9c20849a.tar.gz prosody-16a24fc55fa5027a2d4ae20ce8f086cb9c20849a.zip | |
Backout commit d6366294f618 which I was testing and didn't mean to push to 0.8
| -rw-r--r-- | plugins/mod_bosh.lua | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index a6b84367..5ef6b18e 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -162,13 +162,7 @@ function handle_request(method, body, request) end end - if session.bosh_terminate then - session.log("debug", "Closing session with %d requests open", #session.requests); - session:close(); - return nil; - else - return true; -- Inform httpserver we shall reply later - end + return true; -- Inform httpserver we shall reply later end end @@ -208,6 +202,7 @@ local function bosh_close_stream(session, reason) local session_close_response = { headers = default_headers, body = tostring(close_reply) }; + --FIXME: Quite sure we shouldn't reply to all requests with the error for _, held_request in ipairs(session.requests) do held_request:send(session_close_response); held_request:destroy(); @@ -260,13 +255,7 @@ function stream_callbacks.streamopened(request, attr) local oldest_request = r[1]; if oldest_request then log("debug", "We have an open request, so sending on that"); - response.body = t_concat({ - "<body xmlns='http://jabber.org/protocol/httpbind' ", - session.bosh_terminate and "type='terminate' " or "", - "sid='", sid, "' xmlns:stream = 'http://etherx.jabber.org/streams'>", - tostring(s), - "</body>" - }); + response.body = t_concat{"<body xmlns='http://jabber.org/protocol/httpbind' sid='", sid, "' xmlns:stream = 'http://etherx.jabber.org/streams'>", tostring(s), "</body>" }; oldest_request:send(response); --log("debug", "Sent"); if oldest_request.stayopen then @@ -338,6 +327,13 @@ function stream_callbacks.streamopened(request, attr) session.rid = rid; end + if attr.type == "terminate" then + -- Client wants to end this session + session:close(); + request.notopen = nil; + return; + end + if session.notopen then local features = st.stanza("stream:features"); hosts[session.host].events.fire_event("stream-features", { origin = session, features = features }); @@ -346,12 +342,6 @@ function stream_callbacks.streamopened(request, attr) session.notopen = nil; end - if attr.type == "terminate" then - -- Client wants to end this session, which we'll do - -- after processing any stanzas in this request - session.bosh_terminate = true; - end - request.notopen = nil; -- Signals that we accept this opening tag t_insert(session.requests, request); request.sid = sid; |