Set the socket used for xfrs to nonblocking mode.

diff --git a/ChangeLog b/ChangeLog
index c75df5bb72756ee3be0edb25161f300bcf75f075..c454ed9e3cc926ddd10439fe5ab8ab56e022f02b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-27  Bob Halley  <halley@dnspython.org>
+
+       * dns/query.py (xfr): The socket was not set to nonblocking mode.
+         Thanks to Erik Romijn for reporting this problem.
+
 2009-07-23  Bob Halley  <halley@dnspython.org>
 
        * dns/rdtypes/IN/SRV.py (SRV._cmp): SRV records were compared

diff --git a/dns/query.py b/dns/query.py
index 15b5a90e29163b8f52be0b416c330a5688e71303..09e39d58718861a770317ffe9bb6f6a36f7af0bf 100644 (file)
--- a/dns/query.py
+++ b/dns/query.py
@@ -336,6 +336,7 @@ def xfr(where, zone, rdtype=dns.rdatatype.AXFR, rdclass=dns.rdataclass.IN,
         s = socket.socket(af, socket.SOCK_DGRAM, 0)
     else:
         s = socket.socket(af, socket.SOCK_STREAM, 0)
+    s.setblocking(0)
     if source is not None:
         s.bind(source)
     expiration = _compute_expiration(lifetime)