Mercurial > prosody-hg

comparison net/server_select.lua @ 9635:fc2266339cd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 18 Nov 2018 01:30:20 +0100
parents 1be99aedb0b3 f457edaab510
children 20bf5b47c1fb
comparison
equal deleted inserted replaced
9633:28be90eb774a 9635:fc2266339cd8
1014 err = "invalid port" 1014 err = "invalid port"
1015 elseif sslctx and not has_luasec then 1015 elseif sslctx and not has_luasec then
1016 err = "luasec not found" 1016 err = "luasec not found"
1017 end 1017 end
1018 if not typ then 1018 if not typ then
1019 local n = inet_pton(addr); 1019 local n = inet_pton(address);
1020 if not n then return nil, "invalid-ip"; end 1020 if not n then return nil, "invalid-ip"; end
1021 if #n == 16 then 1021 if #n == 16 then
1022 typ = "tcp6"; 1022 typ = "tcp6";
1023 elseif #n == 4 then 1023 elseif #n == 4 then
1024 typ = "tcp4"; 1024 typ = "tcp4";