diff options
| author | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
| commit | 382080aac7ad79b4cfa7c007d2b362ac92ab1174 (patch) | |
| tree | 906dfdf5f30e7168f5ed66077d09faae6a5a7498 /net/adns.lua | |
| parent | c6f38695b19f39591963331727bf8274e71e3d40 (diff) | |
| parent | 0eefd598cba2ca39b318a060b01ba0532fbb0077 (diff) | |
| download | prosody-382080aac7ad79b4cfa7c007d2b362ac92ab1174.tar.gz prosody-382080aac7ad79b4cfa7c007d2b362ac92ab1174.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net/adns.lua')
| -rw-r--r-- | net/adns.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/adns.lua b/net/adns.lua index cd69a627..158747c6 100644 --- a/net/adns.lua +++ b/net/adns.lua @@ -68,9 +68,9 @@ function new_async_socket(sock, resolver) resolver:servfail(conn); -- Let the magic commence end end - handler = server.wrapclient(sock, "dns", 53, listener); + handler, err = server.wrapclient(sock, "dns", 53, listener); if not handler then - log("warn", "handler is nil"); + return nil, err; end handler.settimeout = function () end |