Software /
code /
prosody
Diff
net/adns.lua @ 5731:902927f1c96f
Merge 0.9->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 10 Jul 2013 07:47:54 +0200 |
parent | 5730:411e9e7d8035 |
child | 5776:bd0ff8ae98a8 |
child | 6287:a380b09649e6 |
line wrap: on
line diff
--- a/net/adns.lua Tue Jul 09 00:04:30 2013 +0100 +++ b/net/adns.lua Wed Jul 10 07:47:54 2013 +0200 @@ -68,9 +68,9 @@ 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