# HG changeset patch # User Kim Alvefur # Date 1387837439 -3600 # Node ID 3b7206981317e3909e5b4d17252be214e6bda4f5 # Parent 958ad646c0f230508c3e0427388a1661a67ca172 net.server_{select,event}: addclient: Handle missing getaddrinfo diff -r 958ad646c0f2 -r 3b7206981317 net/server_event.lua --- a/net/server_event.lua Mon Dec 23 17:57:53 2013 +0100 +++ b/net/server_event.lua Mon Dec 23 23:23:59 2013 +0100 @@ -742,16 +742,14 @@ debug "need luasec, but not available" return nil, "luasec not found" end - if not typ then + if getaddrinfo and not typ then local addrinfo, err = getaddrinfo(addr) if not addrinfo then return nil, err end if addrinfo[1] and addrinfo[1].family == "inet6" then typ = "tcp6" - else - typ = "tcp" end end - local create = socket[typ] + local create = socket[typ or "tcp"] if type( create ) ~= "function" then return nil, "invalid socket type" end diff -r 958ad646c0f2 -r 3b7206981317 net/server_select.lua --- a/net/server_select.lua Mon Dec 23 17:57:53 2013 +0100 +++ b/net/server_select.lua Mon Dec 23 23:23:59 2013 +0100 @@ -942,16 +942,14 @@ elseif sslctx and not has_luasec then err = "luasec not found" end - if not typ then + if getaddrinfo and not typ then local addrinfo, err = getaddrinfo(address) if not addrinfo then return nil, err end if addrinfo[1] and addrinfo[1].family == "inet6" then typ = "tcp6" - else - typ = "tcp" end end - local create = luasocket[typ] + local create = luasocket[typ or "tcp"] if type( create ) ~= "function" then err = "invalid socket type" end