# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1373435274 -7200
# Node ID 902927f1c96f0fd683356b065583b6fa8f8f17e8
# Parent  8de1f9290588bcabfecf12aa89638638a6c9e5de# Parent  411e9e7d8035f9948a7f0ce5598acb85210735be
Merge 0.9->trunk

diff -r 8de1f9290588 -r 902927f1c96f net/adns.lua
--- 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
diff -r 8de1f9290588 -r 902927f1c96f net/dns.lua
--- a/net/dns.lua	Tue Jul 09 00:04:30 2013 +0100
+++ b/net/dns.lua	Wed Jul 10 07:47:54 2013 +0200
@@ -629,10 +629,10 @@
 	else
 		sock, err = socket.udp();
 	end
+	if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
 	if not sock then
 		return nil, err;
 	end
-	if self.socket_wrapper then sock = self.socket_wrapper(sock, self); end
 	sock:settimeout(0);
 	-- todo: attempt to use a random port, fallback to 0
 	sock:setsockname('*', 0);