From 2061dd21188620d5e980509baa1378aa314e613e Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 12 Nov 2009 22:13:11 +0100 Subject: [PATCH] fix receiving long messages in several parts with BOSH. see #5401 --- src/common/xmpp/transports_nb.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py index aafc57dfb..28fd64bdc 100644 --- a/src/common/xmpp/transports_nb.py +++ b/src/common/xmpp/transports_nb.py @@ -648,7 +648,8 @@ class NonBlockingHTTP(NonBlockingTCP): # append currently received data to HTTP msg in buffer self.recvbuff = '%s%s' % (self.recvbuff or '', data) - statusline, headers, httpbody, self.recvbuff = self.parse_http_message(self.recvbuff) + statusline, headers, httpbody, buffer_rest = self.parse_http_message( + self.recvbuff) if not (statusline and headers and httpbody): log.debug('Received incomplete HTTP response') @@ -668,6 +669,10 @@ class NonBlockingHTTP(NonBlockingTCP): log.info('not enough bytes in HTTP response - %d expected, %d got' % (self.expected_length, len(self.recvbuff))) else: + # First part of buffer has been extraced and is going to be handled, + # remove it from buffer + self.recvbuff = buffer_rest + # everything was received self.expected_length = 0 @@ -711,6 +716,7 @@ class NonBlockingHTTP(NonBlockingTCP): headers - dictionary of headers e.g. {'Content-Length': '604', 'Content-Type': 'text/xml; charset=utf-8'}, httpbody - string with http body) + http_rest - what is left in the message after a full HTTP header + body ''' message = message.replace('\r','') splitted = message.split('\n\n')