diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-18 23:29:44 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-18 23:29:44 +0100 |
| commit | 5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275 (patch) | |
| tree | cd5248386c77d045a91e6590f83e18018d2516ac /net | |
| parent | 939a59f26a5f5be6df6d39334879a8f46f1bc716 (diff) | |
| parent | 8aa6c5fbd3217d15753f3102cdb3189140a341cf (diff) | |
| download | prosody-5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275.tar.gz prosody-5bc54ac5ead9dd0ad1bfeabf5a67259c4dc37275.zip | |
Merge 0.7->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns.lua | 9 |
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 |