From 4054ed3384b9c00603bf52646f07acd1e0d6f8dc Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Wed, 3 Aug 2005 10:28:21 +0000 Subject: [PATCH] remove in_buffer patch from xmppp because it was slowing parsing because of timeout being too high? anyways we should reelase 0.8 someday --- src/common/xmpp/dispatcher.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/xmpp/dispatcher.py b/src/common/xmpp/dispatcher.py index c96125930..0643ef10c 100644 --- a/src/common/xmpp/dispatcher.py +++ b/src/common/xmpp/dispatcher.py @@ -32,7 +32,6 @@ class Dispatcher(PlugIn): """ Ancestor of PlugIn class. Handles XMPP stream, i.e. aware of stream headers. Can be plugged out/in to restart these headers (used for SASL f.e.). """ def __init__(self): - self.in_buffer='' PlugIn.__init__(self) DBG_LINE='dispatcher' self.handlers={} @@ -111,13 +110,9 @@ class Dispatcher(PlugIn): 3) 0 (zero) if underlying connection is closed.""" for handler in self._cycleHandlers: handler(self) if self._owner.Connection.pending_data(timeout): - if not self.in_buffer: - try: self.in_buffer=self._owner.Connection.receive() - except IOError: return - data = self.in_buffer[:1024] # parse first 1 MB + try: data=self._owner.Connection.receive() + except IOError: return self.Stream.Parse(data) - self.in_buffer=self.in_buffer[1024:] # parse the rest next time - #if data: return len(data) return '0' # It means that nothing is received but link is alive.