aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-29 15:38:14 +0200
committerKim Alvefur <zash@zash.se>2016-03-29 15:38:14 +0200
commit467b6b0bfe3b69ac9c178ff06b310bb58d4b6617 (patch)
treefe70196be61487570b1e5364d6a2d114791755bd
parentde9765e47979b869c15302e9b7ebb69cc4f9503c (diff)
parent411cd234e3a023091df223211419eceaac832f73 (diff)
downloadprosody-467b6b0bfe3b69ac9c178ff06b310bb58d4b6617.tar.gz
prosody-467b6b0bfe3b69ac9c178ff06b310bb58d4b6617.zip
Merge 0.10->trunk
-rw-r--r--net/dns.lua4
-rw-r--r--util/jid.lua1
2 files changed, 3 insertions, 2 deletions
diff --git a/net/dns.lua b/net/dns.lua
index b047ec54..689020a4 100644
--- 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 60bb0829..522fb126 100644
--- 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;