projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 24bf356)
mod_bosh: Remove requests from the session table using table.remove(), prevents the...
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:42:53 +0000 (11:42 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:42:53 +0000 (11:42 +0100)
plugins/mod_bosh.lua patch | blob | history

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 02f3ce38457eefc7e9bcddb3debeac80603aa3aa..150d1fd0591e03e094e1f8e22630ba84f6874167 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -23,7 +23,7 @@ local logger = require "util.logger";
 local log = logger.init("mod_bosh");
 
 local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send)
-local stream_callbacks = { stream_ns = "http://jabber.org/protocol/httpbind", stream_tag = "body", default_ns = "jabber:client" };
+local stream_callbacks = { stream_tag = "http://jabber.org/protocol/httpbind\1body", default_ns = "jabber:client" };
 
 local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1;
 local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
@@ -34,22 +34,6 @@ local BOSH_DEFAULT_MAXPAUSE = tonumber(module:get_option("bosh_max_pause")) or 3
 local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
 local session_close_reply = { headers = default_headers, body = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate" }), attr = {} };
 
-local cross_domain = module:get_option("cross_domain_bosh");
-if cross_domain then
-       default_headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS";
-       default_headers["Access-Control-Allow-Headers"] = "Content-Type";
-       default_headers["Access-Control-Max-Age"] = "7200";
-
-       if cross_domain == true then
-               default_headers["Access-Control-Allow-Origin"] = "*";
-       elseif type(cross_domain) == "table" then
-               cross_domain = table.concat(cross_domain, ", ");
-       end
-       if type(cross_domain) == "string" then
-               default_headers["Access-Control-Allow-Origin"] = cross_domain;
-       end
-end
-
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local os_time = os.time;
 
@@ -63,8 +47,11 @@ function on_destroy_request(request)
        local session = sessions[request.sid];
        if session then
                local requests = session.requests;
-               for i,r in pairs(requests) do
-                       if r == request then requests[i] = nil; break; end
+               for i,r in ipairs(requests) do
+                       if r == request then
+                               t_remove(requests, i);
+                               break;
+                       end
                end
                
                -- If this session now has no requests open, mark it as inactive
@@ -77,13 +64,9 @@ end
 
 function handle_request(method, body, request)
        if (not body) or request.method ~= "POST" then
-               if request.method == "OPTIONS" then
-                       return { headers = default_headers, body = "" };
-               else
-                       return "<html><body>You really don't look like a BOSH client to me... what do you want?</body></html>";
-               end
+               return "<html><body>You really don't look like a BOSH client to me... what do you want?</body></html>";
        end
-       if not method then
+       if not method then 
                log("debug", "Request %s suffered error %s", tostring(request.id), body);
                return;
        end
@@ -206,15 +189,14 @@ function stream_callbacks.streamopened(request, attr)
                -- Send creation response
                
                local features = st.stanza("stream:features");
-               hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
                fire_event("stream-features", session, features);
                --xmpp:version='1.0' xmlns:xmpp='urn:xmpp:xbosh'
-               local response = st.stanza("body", { xmlns = xmlns_bosh,
-                                                                       inactivity = tostring(BOSH_DEFAULT_INACTIVITY), polling = tostring(BOSH_DEFAULT_POLLING), requests = tostring(BOSH_DEFAULT_REQUESTS), hold = tostring(session.bosh_hold), maxpause = "120",
-                                                                       sid = sid, authid = sid, ver  = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0",
+               local response = st.stanza("body", { xmlns = xmlns_bosh, 
+                                                                       inactivity = tostring(BOSH_DEFAULT_INACTIVITY), polling = tostring(BOSH_DEFAULT_POLLING), requests = tostring(BOSH_DEFAULT_REQUESTS), hold = tostring(session.bosh_hold), maxpause = "120", 
+                                                                       sid = sid, authid = sid, ver  = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0", 
                                                                        ["xmlns:xmpp"] = "urn:xmpp:xbosh", ["xmlns:stream"] = "http://etherx.jabber.org/streams" }):add_child(features);
                request:send{ headers = default_headers, body = tostring(response) };
-               
+                               
                request.sid = sid;
                return;
        end
@@ -258,7 +240,6 @@ function stream_callbacks.streamopened(request, attr)
        
        if session.notopen then
                local features = st.stanza("stream:features");
-               hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
                fire_event("stream-features", session, features);
                session.send(features);
                session.notopen = nil;
@@ -276,7 +257,7 @@ function stream_callbacks.handlestanza(request, stanza)
                if stanza.attr.xmlns == xmlns_bosh then
                        stanza.attr.xmlns = nil;
                end
-               session.ip = request.handler:ip();
+               session.ip = request.handler.ip();
                core_process_stanza(session, stanza);
        end
 end
@@ -320,14 +301,7 @@ function on_timer()
        end
 end
 
+local ports = module:get_option("bosh_ports") or { 5280 };
+httpserver.new_from_config(ports, handle_request, { base = "http-bind" });
 
-local function setup()
-       local ports = module:get_option("bosh_ports") or { 5280 };
-       httpserver.new_from_config(ports, handle_request, { base = "http-bind" });
-       server.addtimer(on_timer);
-end
-if prosody.start_time then -- already started
-       setup();
-else
-       prosody.events.add_handler("server-started", setup);
-end
+server.addtimer(on_timer);