aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-07-10 13:01:17 +0100
committerMatthew Wild <mwild1@gmail.com>2020-07-10 13:01:17 +0100
commita2ef355d2011ca458ffb941e25a032b78194fc56 (patch)
tree40860f949a3448bcc91c8e665fdc958c54a337fe
parentf537afbb8e245beea12af9afa0de12744c6c595a (diff)
parenta80cdecc466865986cd7928b6b4d070905e1fd73 (diff)
downloadprosody-a2ef355d2011ca458ffb941e25a032b78194fc56.tar.gz
prosody-a2ef355d2011ca458ffb941e25a032b78194fc56.zip
Merge 0.11->trunk
-rw-r--r--net/resolvers/basic.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/resolvers/basic.lua b/net/resolvers/basic.lua
index 6458c638..a00fbce1 100644
--- a/net/resolvers/basic.lua
+++ b/net/resolvers/basic.lua
@@ -70,6 +70,7 @@ end
local function new(hostname, port, conn_type, extra)
local ascii_host = idna_to_ascii(hostname);
local targets = nil;
+ conn_type = conn_type or "tcp";
local is_ip = inet_pton(hostname);
if not is_ip and hostname:sub(1,1) == '[' then
@@ -87,7 +88,7 @@ local function new(hostname, port, conn_type, extra)
return setmetatable({
hostname = ascii_host;
port = port;
- conn_type = conn_type or "tcp";
+ conn_type = conn_type;
extra = extra;
targets = targets;
}, resolver_mt);