Comparison

plugins/mod_bosh.lua @ 4316:2478698bdc52

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 07 Jun 2011 01:29:34 +0100
parent 4223:9fb6e8ec15ed
parent 4313:42d7d09fdda0
child 4327:98ae0d0b4d07
comparison
equal deleted inserted replaced
4307:332fc256c76e 4316:2478698bdc52
123 -- the body are processed in this next line before it returns. 123 -- the body are processed in this next line before it returns.
124 stream:feed(body); 124 stream:feed(body);
125 125
126 local session = sessions[request.sid]; 126 local session = sessions[request.sid];
127 if session then 127 if session then
128 -- Session was marked as inactive, since we have 128 -- Session was marked as inactive, since we have
129 -- a request open now, unmark it 129 -- a request open now, unmark it
130 if inactive_sessions[session] then 130 if inactive_sessions[session] and #session.requests > 0 then
131 inactive_sessions[session] = nil; 131 inactive_sessions[session] = nil;
132 end 132 end
133 133
134 local r = session.requests; 134 local r = session.requests;
135 log("debug", "Session %s has %d out of %d requests open", request.sid, #r, session.bosh_hold); 135 log("debug", "Session %s has %d out of %d requests open", request.sid, #r, session.bosh_hold);
136 log("debug", "and there are %d things in the send_buffer", #session.send_buffer); 136 log("debug", "and there are %d things in the send_buffer", #session.send_buffer);
137 if #r > session.bosh_hold then 137 if #r > session.bosh_hold then