aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-09 00:14:27 +0100
commitd2d92d933717827460c637421172b410f574e619 (patch)
treeb1ae5f3567985e99fa359ae10fed5d9fdab85d91 /net/dns.lua
parent31895cd45fbb41608ae19a3c02013d5ee5263f38 (diff)
parent376dd433962a1a897a239d06dbc91d3e03290fe3 (diff)
downloadprosody-d2d92d933717827460c637421172b410f574e619.tar.gz
prosody-d2d92d933717827460c637421172b410f574e619.zip
Merge 0.10->trunk
Diffstat (limited to 'net/dns.lua')
-rw-r--r--net/dns.lua11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 037f3ec6..992f3986 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -213,15 +213,6 @@ function cache_metatable.__tostring(cache)
end
-function resolver:new() -- - - - - - - - - - - - - - - - - - - - - resolver
- local r = { active = {}, cache = {}, unsorted = {} };
- setmetatable(r, resolver);
- setmetatable(r.cache, cache_metatable);
- setmetatable(r.unsorted, { __mode = 'kv' });
- return r;
-end
-
-
-- packet layer -------------------------------------------------- packet layer
@@ -1054,8 +1045,6 @@ end
function dns.resolver () -- - - - - - - - - - - - - - - - - - - - - resolver
- -- this function seems to be redundant with resolver.new ()
-
local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, best_server = 1 };
setmetatable (r, resolver);
setmetatable (r.cache, cache_metatable);