# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1270332551 -3600
# Node ID db3c0ecce3f4192ce5f1b28ec5af16180b6a79f2
# Parent  3cafa20e22e94a5018170b5d3f790e4eda87a6fb# Parent  de405832bfb66f3bdc0aa96f50b4eb71e4337b1a
Merge 0.6->0.7

diff -r 3cafa20e22e9 -r db3c0ecce3f4 plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Tue Mar 30 19:46:53 2010 +0100
+++ b/plugins/mod_bosh.lua	Sat Apr 03 23:09:11 2010 +0100
@@ -23,7 +23,7 @@
 local log = logger.init("mod_bosh");
 
 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_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
@@ -274,7 +274,7 @@
 	local session = sessions[request.sid];
 	if session then
 		if stanza.attr.xmlns == xmlns_bosh then
-			stanza.attr.xmlns = "jabber:client";
+			stanza.attr.xmlns = nil;
 		end
 		session.ip = request.handler:ip();
 		core_process_stanza(session, stanza);
diff -r 3cafa20e22e9 -r db3c0ecce3f4 util/stanza.lua
diff -r 3cafa20e22e9 -r db3c0ecce3f4 util/uuid.lua
--- a/util/uuid.lua	Tue Mar 30 19:46:53 2010 +0100
+++ b/util/uuid.lua	Sat Apr 03 23:09:11 2010 +0100
@@ -32,7 +32,7 @@
 	buffer = new_random(buffer..x);
 end
 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);
 	buffer = buffer:sub(n+1);
 	return r;
diff -r 3cafa20e22e9 -r db3c0ecce3f4 util/ztact.lua
--- a/util/ztact.lua	Tue Mar 30 19:46:53 2010 +0100
+++ b/util/ztact.lua	Sat Apr 03 23:09:11 2010 +0100
@@ -114,7 +114,7 @@
 
 function tostring_r (d, indent, tab0)    -- - - - - - - - - - - - -  tostring_r
 
-  tab1 = tab0 or {}
+  local tab1 = tab0 or {}
   local rep = string.rep ('  ', indent or 0)
   if type (d) == 'table' then
     for k,v in pairs (d) do
@@ -210,7 +210,7 @@
 
 
 local function test_queue ()
-  t = {}
+  local t = {}
   enqueue (t, 1)
   enqueue (t, 2)
   enqueue (t, 3)