mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Matthew Wild 2020-07-10 13:01:17 +01:00
commit a2ef355d20
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/resolvers/basic.lua
View file

@ -70,6 +70,7 @@ end
local function new(hostname, port, conn_type, extra) local function new(hostname, port, conn_type, extra)
local ascii_host = idna_to_ascii(hostname); local ascii_host = idna_to_ascii(hostname);
local targets = nil; local targets = nil;
conn_type = conn_type or "tcp";
local is_ip = inet_pton(hostname); local is_ip = inet_pton(hostname);
if not is_ip and hostname:sub(1,1) == '[' then if not is_ip and hostname:sub(1,1) == '[' then
@ -87,7 +88,7 @@ local function new(hostname, port, conn_type, extra)
return setmetatable({ return setmetatable({
hostname = ascii_host; hostname = ascii_host;
port = port; port = port;
conn_type = conn_type or "tcp"; conn_type = conn_type;
extra = extra; extra = extra;
targets = targets; targets = targets;
}, resolver_mt); }, resolver_mt);