summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@nominum.com>2009-07-27 09:26:09 +0200
committerBob Halley <halley@nominum.com>2009-07-27 09:26:09 +0200
commitdfb195842817670ee3eadf732456aa2e4c87aa73 (patch)
treef41ee815cec1b5d87a45fcd596fd342a015bb633
parent9b72d6bce1c6f85d8f8c341f5a206d8ed4f10b0f (diff)
downloaddnspython-dfb195842817670ee3eadf732456aa2e4c87aa73.tar.gz
Set the socket used for xfrs to nonblocking mode.
-rw-r--r--ChangeLog5
-rw-r--r--dns/query.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c75df5b..c454ed9 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 15b5a90..09e39d5 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)