Merge 0.10->trunk

diff --git a/net/dns.lua b/net/dns.lua
index b047ec542ec3813328d8ee2aaaaa153ba98316df..689020a47a792e986fc95ad01546c654eca25a1e 100644 (file)
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -22,8 +22,8 @@ local is_windows = (_ and windows) or os.getenv("WINDIR");
 local coroutine, io, math, string, table =
       coroutine, io, math, string, table;
 
-local ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type=
-      ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type;
+local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, unpack=
+      ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, table.unpack or unpack;
 
 local ztact = { -- public domain 20080404 lua@ztact.com
        get = function(parent, ...)

diff --git a/util/jid.lua b/util/jid.lua
index 60bb0829557090e24f4f9b1c6dddf639d25c326e..522fb126747439aea5add0853db74f35643fc014 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -8,6 +8,7 @@
 
 
 
+local select = select;
 local match, sub = string.match, string.sub;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 local nameprep = require "util.encodings".stringprep.nameprep;