Software / code / prosody
Changeset
7324:7e6409462f79
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Mar 2016 15:38:14 +0200 |
| parents | 7320:3849b5187d47 (current diff) 7323:a1570219b865 (diff) |
| children | 7327:d62f0471470f |
| files | net/server_select.lua |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Sat Mar 26 20:17:59 2016 +0000 +++ b/net/dns.lua Tue Mar 29 15:38:14 2016 +0200 @@ -22,8 +22,8 @@ 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, ...)
--- a/util/jid.lua Sat Mar 26 20:17:59 2016 +0000 +++ b/util/jid.lua Tue Mar 29 15:38:14 2016 +0200 @@ -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;
