From 0eefd598cba2ca39b318a060b01ba0532fbb0077 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 10 Jul 2013 07:45:10 +0200
Subject: net.dns, net.adns: Make sure errors from net.server are propagated
 (thanks asterix)

---
 net/dns.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/dns.lua')

diff --git a/net/dns.lua b/net/dns.lua
index 89b50255..cdd949a2 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -622,10 +622,10 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
 
 	local err;
 	sock, err = socket.udp();
+	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);
-- 
cgit v1.2.3