aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-04-13 18:23:02 +0200
committerKim Alvefur <zash@zash.se>2019-04-13 18:23:02 +0200
commit7a446d8ebdf309dbddad4139b1759474db3d5568 (patch)
tree9faf2858cb48870972f811539b197f764b422876
parent9163493840c796d31feabdf3d3d379442e3a7020 (diff)
parentdadf242556770176ea589426bf97444a550c4553 (diff)
downloadprosody-7a446d8ebdf309dbddad4139b1759474db3d5568.tar.gz
prosody-7a446d8ebdf309dbddad4139b1759474db3d5568.zip
Merge 0.11->trunk
-rw-r--r--net/dns.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dns.lua b/net/dns.lua
index af5f1216..3902f95c 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -704,6 +704,7 @@ function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
end
end
end
+ resolv_conf:close();
end
if not self.server or #self.server == 0 then
-- TODO log warning about no nameservers, adding localhost as the default nameserver