# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274221784 -3600
# Node ID 27531070cd589cc8ccc5b7e67ca2a36435cb87f8
# Parent  22f1723591f8a8695c7a5c35a6531356f76e39bd# Parent  15150ad771df0876d983e6d2b8933a8e18b42dc8
Merge 0.7->trunk

diff -r 22f1723591f8 -r 27531070cd58 configure
--- 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
diff -r 22f1723591f8 -r 27531070cd58 net/dns.lua
--- 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