projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2eca719)
mod_bosh: Mark a session as active when a request comes in, even if we don't end...
authorMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 10:48:57 +0000 (11:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 5 Jun 2011 10:48:57 +0000 (11:48 +0100)
plugins/mod_bosh.lua patch | blob | history

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index c2c7eae98d1b7174f749d2291b421d3a1b1f2a5b..5ef6b18e71ce7a650f0a23ee413c95b3599d987a 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -125,11 +125,11 @@ function handle_request(method, body, request)
        
        local session = sessions[request.sid];
        if session then
-               -- Session was marked as inactive, since we have
-               -- a request open now, unmark it
-               if inactive_sessions[session] then
-                       inactive_sessions[session] = nil;
-               end
+               -- Session was marked as inactive, since we have
+               -- a request open now, unmark it
+               if inactive_sessions[session] and #session.requests > 0 then
+                       inactive_sessions[session] = nil;
+               end
 
                local r = session.requests;
                log("debug", "Session %s has %d out of %d requests open", request.sid, #r, session.bosh_hold);
@@ -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;