summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-30 09:08:58 -0700
committerLance Stout <lancestout@gmail.com>2012-07-30 09:08:58 -0700
commit44ce01a70b7926a1e1f4af6692be3bdc671f7318 (patch)
treec6992b7420f3731cea595b4d382c2d2987a7554a /sleekxmpp/xmlstream/xmlstream.py
parentc2189b4ecd6b022ed9900a6f411bd7e9d57c47ce (diff)
parente4b4c676379df30d268d28341b643cd9cd10eb22 (diff)
downloadslixmpp-44ce01a70b7926a1e1f4af6692be3bdc671f7318.tar.gz
slixmpp-44ce01a70b7926a1e1f4af6692be3bdc671f7318.tar.bz2
slixmpp-44ce01a70b7926a1e1f4af6692be3bdc671f7318.tar.xz
slixmpp-44ce01a70b7926a1e1f4af6692be3bdc671f7318.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index a0b6e4c2..4cc9e169 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -468,7 +468,7 @@ class XMLStream(object):
log.debug("No remaining DNS records to try.")
self.dns_answers = None
if reattempt:
- self.reconnect_delay = delay
+ self.reconnect_delay = None
return False
af = Socket.AF_INET