mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.6->0.7

Browse source
This commit is contained in:
Matthew Wild 2010-04-03 23:09:11 +01:00
commit 89e9f18d2a
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_bosh.lua
View file

@ -23,7 +23,7 @@ local logger = require "util.logger";
local log = logger.init("mod_bosh"); local log = logger.init("mod_bosh");
local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send) 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 = xmlns_bosh }; local stream_callbacks = { stream_ns = "http://jabber.org/protocol/httpbind", stream_tag = "body", default_ns = "jabber:client" };
local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1; 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; local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
@ -274,7 +274,7 @@ function stream_callbacks.handlestanza(request, stanza)
local session = sessions[request.sid]; local session = sessions[request.sid];
if session then if session then
if stanza.attr.xmlns == xmlns_bosh then if stanza.attr.xmlns == xmlns_bosh then
stanza.attr.xmlns = "jabber:client"; stanza.attr.xmlns = nil;
end end
session.ip = request.handler:ip(); session.ip = request.handler:ip();
core_process_stanza(session, stanza); core_process_stanza(session, stanza);

2
util/uuid.lua
View file

@ -32,7 +32,7 @@ local function _seed(x)
buffer = new_random(buffer..x); buffer = new_random(buffer..x);
end end
local function get_nibbles(n) local function get_nibbles(n)
if #buffer < n then seed(uniq_time()); end if #buffer < n then _seed(uniq_time()); end
local r = buffer:sub(0, n); local r = buffer:sub(0, n);
buffer = buffer:sub(n+1); buffer = buffer:sub(n+1);
return r; return r;

4
util/ztact.lua
View file

@ -114,7 +114,7 @@ function tohex (s) -- - - - - - - - - - - - - - - - - - - - - - - - - tohex
function tostring_r (d, indent, tab0) -- - - - - - - - - - - - - tostring_r function tostring_r (d, indent, tab0) -- - - - - - - - - - - - - tostring_r
tab1 = tab0 or {} local tab1 = tab0 or {}
local rep = string.rep (' ', indent or 0) local rep = string.rep (' ', indent or 0)
if type (d) == 'table' then if type (d) == 'table' then
for k,v in pairs (d) do for k,v in pairs (d) do
@ -210,7 +210,7 @@ function enqueue (queue, element) -- - - - - - - - - - - - - - - - - enqueue
local function test_queue () local function test_queue ()
t = {} local t = {}
enqueue (t, 1) enqueue (t, 1)
enqueue (t, 2) enqueue (t, 2)
enqueue (t, 3) enqueue (t, 3)