Mercurial > prosody-hg

comparison plugins/mod_bosh.lua @ 7388:77a3ef937152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 19 Apr 2016 17:44:11 +0200
parents c8923f882274 addd041342bd
children bbed548b4306
comparison
equal deleted inserted replaced
7386:5a9af30d5737 7388:77a3ef937152
285 wait = math_min(wait, bosh_max_wait); 285 wait = math_min(wait, bosh_max_wait);
286 286
287 -- New session 287 -- New session
288 sid = new_uuid(); 288 sid = new_uuid();
289 local session = { 289 local session = {
290 type = "c2s_unauthed", conn = {}, sid = sid, rid = rid-1, host = attr.to, 290 type = "c2s_unauthed", conn = {}, sid = sid, rid = rid, host = attr.to,
291 bosh_version = attr.ver, bosh_wait = wait, streamid = sid, 291 bosh_version = attr.ver, bosh_wait = wait, streamid = sid,
292 bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY, 292 bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
293 requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, 293 requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream,
294 close = bosh_close_stream, dispatch_stanza = core_process_stanza, notopen = true, 294 close = bosh_close_stream, dispatch_stanza = core_process_stanza, notopen = true,
295 log = logger.init("bosh"..sid), secure = consider_bosh_secure or request.secure, 295 log = logger.init("bosh"..sid), secure = consider_bosh_secure or request.secure,