Software / code / prosody
Changeset
3052:27531070cd58
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 18 May 2010 23:29:44 +0100 |
| parents | 3048:22f1723591f8 (current diff) 3051:15150ad771df (diff) |
| children | 3053:8bd3857a75ee |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue May 18 00:47:35 2010 +0100 +++ b/configure Tue May 18 23:29:44 2010 +0100 @@ -61,7 +61,7 @@ while [ "$1" ] do - value="`echo $1 | sed 's/.*=\(.*\)/\1/'`" + value="`echo $1 | sed 's/[^=]*=\(.*\)/\1/'`" if echo "$value" | grep -q "~" then echo
--- a/net/dns.lua Tue May 18 00:47:35 2010 +0100 +++ b/net/dns.lua Tue May 18 23:29:44 2010 +0100 @@ -851,7 +851,14 @@ 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
