From 96dd7b8ba7dc10c300ed7c0c7d19998feb03dc36 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 7 Oct 2008 15:09:39 +0000
Subject: [PATCH] revert [10494]. see #4388
---
src/common/connection.py | 1 +
src/common/connection_handlers.py | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/connection.py b/src/common/connection.py
index 4ff58a4144..eae94c2f97 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -945,6 +945,7 @@ class Connection(ConnectionHandlers):
self.connection = con
if not self.connection:
return
+ self.connection.set_send_timeout(self.keepalives, self.sendPing)
self.connection.onreceive(None)
iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
id = self.connection.getAnID()
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 7cd74568c7..fb2a7db084 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -2313,7 +2313,6 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
self.discoverInfo(jid)
self.dispatch('ROSTER', roster)
- self.connection.set_send_timeout(self.keepalives, self.sendPing)
def _send_first_presence(self, signed = ''):
show = self.continue_connect_info[0]
--
GitLab