From 5635265203712650981c479867cdcece01fa6d61 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 16 Mar 2011 06:28:12 +0800 Subject: [PATCH 1/2] Avoid infinite loop on version result We need to check if type="get". otherwise we will send our version when we will receive the version of the remote entity, and thus going in an infinite loop. --- sleekxmpp/plugins/xep_0092/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleekxmpp/plugins/xep_0092/version.py b/sleekxmpp/plugins/xep_0092/version.py index fb3671e4..46bb27f7 100644 --- a/sleekxmpp/plugins/xep_0092/version.py +++ b/sleekxmpp/plugins/xep_0092/version.py @@ -42,7 +42,7 @@ class xep_0092(base_plugin): self.xmpp.register_handler( Callback('Software Version', - StanzaPath('iq/software_version'), + StanzaPath('iq@=get/software_version'), self._handle_version)) register_stanza_plugin(Iq, Version) From 6244857746cff020e02702de93270d8add64d48e Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 18 Mar 2011 15:47:21 -0400 Subject: [PATCH 2/2] Fix self.disconnect(reconnect=True) not working. --- sleekxmpp/xmlstream/xmlstream.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 18d891a3..1c165562 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -353,8 +353,7 @@ class XMLStream(object): self.send_raw(self.stream_footer) # Wait for confirmation that the stream was # closed in the other direction. - if not reconnect: - self.auto_reconnect = False + self.auto_reconnect = reconnect self.stream_end_event.wait(4) if not self.auto_reconnect: self.stop.set()