Diff

net/dns.lua @ 5731:902927f1c96f

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 10 Jul 2013 07:47:54 +0200
parent 5705:6eebd5808fbc
parent 5730:411e9e7d8035
child 5776:bd0ff8ae98a8
line wrap: on
line diff
--- 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);