Mercurial > prosody-hg

comparison plugins/mod_bosh.lua @ 5645:ae079d57af2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 05 Jun 2013 21:36:29 +0100
parents 4f1889672063 f9cfe6f5d60f
children c4b6ebea7185
comparison
equal deleted inserted replaced
5641:92ffddd02c96 5645:ae079d57af2e
282 ["xmlns:stream"] = "http://etherx.jabber.org/streams"; 282 ["xmlns:stream"] = "http://etherx.jabber.org/streams";
283 type = session.bosh_terminate and "terminate" or nil; 283 type = session.bosh_terminate and "terminate" or nil;
284 sid = sid; 284 sid = sid;
285 }; 285 };
286 if creating_session then 286 if creating_session then
287 creating_session = nil;
287 body_attr.inactivity = tostring(BOSH_DEFAULT_INACTIVITY); 288 body_attr.inactivity = tostring(BOSH_DEFAULT_INACTIVITY);
288 body_attr.polling = tostring(BOSH_DEFAULT_POLLING); 289 body_attr.polling = tostring(BOSH_DEFAULT_POLLING);
289 body_attr.requests = tostring(BOSH_DEFAULT_REQUESTS); 290 body_attr.requests = tostring(BOSH_DEFAULT_REQUESTS);
290 body_attr.wait = tostring(session.bosh_wait); 291 body_attr.wait = tostring(session.bosh_wait);
291 body_attr.hold = tostring(session.bosh_hold); 292 body_attr.hold = tostring(session.bosh_hold);