From 87d53ac334afa2ffe1b431f91d4e2bf5991860d4 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sun, 11 Oct 2015 22:07:10 +0200 Subject: pydns_timeout Sent upstream Aug 8, 2013 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718547 Patch-Name: pydns_timeout.patch --- DNS/Base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/DNS/Base.py b/DNS/Base.py index 7f17864..26459a8 100644 --- a/DNS/Base.py +++ b/DNS/Base.py @@ -276,6 +276,11 @@ class DnsRequest: # servers worked: first_socket_error = first_socket_error or e continue + except TimeoutError, t: + first_socket_error = first_socket_error or t + continue + if self.response: + break if not self.response and first_socket_error: raise first_socket_error @@ -313,6 +318,11 @@ class DnsRequest: except socket.error, e: first_socket_error = first_socket_error or e continue + except TimeoutError, t: + first_socket_error = first_socket_error or t + continue + if self.response: + break if not self.response and first_socket_error: raise first_socket_error