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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-11-02 19:38:12 +01:00
commit 690775a9b4
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/resolvers/basic.lua
View file

@ -1,5 +1,6 @@
local adns = require "net.adns";
local inet_pton = require "util.net".pton;
local idna_to_ascii = require "util.encodings".idna.to_ascii;
local unpack = table.unpack or unpack; -- luacheck: ignore 113
local methods = {};
@ -18,6 +19,11 @@ function methods:next(cb)
return;
end
if not self.hostname then
-- FIXME report IDNA error
cb(nil);
end
local targets = {};
local n = 2;
local function ready()
@ -60,7 +66,7 @@ end
local function new(hostname, port, conn_type, extra)
return setmetatable({
hostname = hostname;
hostname = idna_to_ascii(hostname);
port = port;
conn_type = conn_type or "tcp";
extra = extra;