aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_bosh.lua
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/mod_bosh.lua')
-rw-r--r--plugins/mod_bosh.lua9
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 3dd7a6a0..df89f88e 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -42,7 +42,7 @@ function handle_request(method, body, request)
log("debug", "Request %s suffered error %s", tostring(request.id), body);
return;
end
- log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body));
+ --log("debug", "Handling new request %s: %s\n----------", request.id, tostring(body));
request.notopen = true;
request.log = log;
local parser = lxp.new(init_xmlhandlers(request, stream_callbacks), "|");
@@ -79,7 +79,7 @@ function handle_request(method, body, request)
waiting_requests[request] = true;
end
- log("debug", "Had nothing to say, so leaving request unanswered for now");
+ log("debug", "Have nothing to say, so leaving request unanswered for now");
return true;
end
end
@@ -101,8 +101,6 @@ local function bosh_close_stream(session, reason)
end
function stream_callbacks.streamopened(request, attr)
- print("Attr:")
- for k,v in pairs(attr) do print("", k, v); end
log("debug", "BOSH body open (sid: %s)", attr.sid);
local sid = attr.sid
if not sid then
@@ -139,7 +137,7 @@ function stream_callbacks.streamopened(request, attr)
log("debug", "We have an open request, so using that to send with");
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");
+ --log("debug", "Sent");
if oldest_request.stayopen then
if #r>1 then
-- Move front request to back
@@ -245,6 +243,7 @@ function on_timer()
(session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now);
sessions[session.sid] = nil;
inactive_sessions[session] = nil;
+ session.bosh_max_inactive = nil; -- Stop us marking this session as active during destroy
sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
end
else