Merge 0.9->trunk

2 files changed, 3 insertions, 3 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
diff --git a/net/dns.lua b/net/dns.lua
index bd42db73..95f09cc9 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -629,10 +629,10 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
 	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);