aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-07-10 13:00:02 +0100
committerMatthew Wild <mwild1@gmail.com>2020-07-10 13:00:02 +0100
commit41af73564b474fb57851ad087ffbd408041349d5 (patch)
tree079555aeea51534a9eb04b668f4bfcbaa2215194 /net
parentb3512456a0649b28c4b85610170151893d49f795 (diff)
downloadprosody-41af73564b474fb57851ad087ffbd408041349d5.tar.gz
prosody-41af73564b474fb57851ad087ffbd408041349d5.zip
net.resolvers.basic: Default conn_type to 'tcp' consistently if unspecified (thanks marc0s)
Fixes a traceback when passed an IP address with no conn_type.
Diffstat (limited to 'net')
-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 08c71ef5..867ccf60 100644
--- a/net/resolvers/basic.lua
+++ b/net/resolvers/basic.lua
@@ -58,6 +58,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
@@ -75,7 +76,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);