diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
| commit | 27b4049481f29dcac2d6093c40ad7e8bf1ea8899 (patch) | |
| tree | 39ca42dddf3935546a0c3c37b2e2456a554899f1 /net/adns.lua | |
| parent | ae885de6a2f36eacd6085e7582e5019882208d23 (diff) | |
| parent | 8c0d996be4f47b77a02668474d3d8a0a41bd0f98 (diff) | |
| download | prosody-27b4049481f29dcac2d6093c40ad7e8bf1ea8899.tar.gz prosody-27b4049481f29dcac2d6093c40ad7e8bf1ea8899.zip | |
Merge 0.9->0.10
Diffstat (limited to 'net/adns.lua')
| -rw-r--r-- | net/adns.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/adns.lua b/net/adns.lua index 158747c6..08421f77 100644 --- a/net/adns.lua +++ b/net/adns.lua @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- @@ -64,7 +64,7 @@ function new_async_socket(sock, resolver) if resolver.socketset[conn] == resolver.best_server and resolver.best_server == #servers then log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]); end - + resolver:servfail(conn); -- Let the magic commence end end @@ -72,7 +72,7 @@ function new_async_socket(sock, resolver) if not handler then return nil, err; end - + handler.settimeout = function () end handler.setsockname = function (_, ...) return sock:setsockname(...); end handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _:set_send(dummy_send); return ret; end |