From: Bob Halley <halley@nominum.com>
Date: Mon, 27 Jul 2009 07:26:09 +0000 (+0200)
Subject: Set the socket used for xfrs to nonblocking mode.
X-Git-Tag: v1.8.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfb195842817670ee3eadf732456aa2e4c87aa73;p=thirdparty%2Fdnspython.git

Set the socket used for xfrs to nonblocking mode.
---

diff --git a/ChangeLog b/ChangeLog
index c75df5bb..c454ed9e 100644
--- 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 15b5a90e..09e39d58 100644
--- 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)