Merge 0.7->trunk

1 files changed, 8 insertions, 1 deletions

diff --git a/net/dns.lua b/net/dns.lua
index 8855cc61..020a0ae8 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -851,7 +851,14 @@ end
 
 function resolver:lookup(qname, qtype, qclass)    -- - - - - - - - - -  lookup
 	self:query (qname, qtype, qclass)
-	while self:pulse() do socket.select(self.socket, nil, 4); end
+	while self:pulse() do
+           local recvt = {}
+           local i, s
+           for i, s in ipairs(self.socket) do
+              recvt[i] = s.socket()
+           end
+           socket.select(recvt, nil, 4)
+        end
 	--print(self.cache);
 	return self:peek(qname, qtype, qclass);
 end