Skip to content

Z
Zope
Commit 4b5d68bd authored by Amos Latteier's avatar Amos Latteier
Browse files
Options

fixed bug in sized input collection which caused dropped bytes.

parent 7318943a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
ZServer/medusa/asynchat.py
View file @ 4b5d68bd
# -*- Mode: Python; tab-width: 4 -*- # -*- Mode: Python; tab-width: 4 -*-
# $Id: asynchat.py,v 1.5 1999/01/18 22:43:43 amos Exp $ # $Id: asynchat.py,v 1.6 1999/02/05 02:14:39 amos Exp $
# Author: Sam Rushing <rushing@nightmare.com> # Author: Sam Rushing <rushing@nightmare.com>
# ====================================================================== # ======================================================================
...@@ -118,7 +118,8 @@ class async_chat (asyncore.dispatcher): ...@@ -118,7 +118,8 @@ class async_chat (asyncore.dispatcher):
# until we have read that much. ac_in_buffer_read tracks # until we have read that much. ac_in_buffer_read tracks
# how much data has been read. # how much data has been read.
if type(terminator)==types.IntType: if type(terminator)==types.IntType:
self.ac_in_buffer_read=self.ac_in_buffer_read+len(data) self.ac_in_buffer_read=self.ac_in_buffer_read + \
len(self.ac_in_buffer)
if self.ac_in_buffer_read < self.terminator: if self.ac_in_buffer_read < self.terminator:
self.collect_incoming_data(self.ac_in_buffer) self.collect_incoming_data(self.ac_in_buffer)
self.ac_in_buffer='' self.ac_in_buffer=''
...@@ -132,8 +133,9 @@ class async_chat (asyncore.dispatcher): ...@@ -132,8 +133,9 @@ class async_chat (asyncore.dispatcher):
self.collect_incoming_data(self.ac_in_buffer[:border]) self.collect_incoming_data(self.ac_in_buffer[:border])
self.ac_in_buffer=self.ac_in_buffer[border:] self.ac_in_buffer=self.ac_in_buffer[border:]
self.ac_in_buffer_read=0 self.ac_in_buffer_read=0
data=''
self.found_terminator() self.found_terminator()
break continue
terminator_len = len(terminator) terminator_len = len(terminator)
# 4 cases: # 4 cases:
......
lib/python/ZServer/medusa/asynchat.py
View file @ 4b5d68bd
# -*- Mode: Python; tab-width: 4 -*- # -*- Mode: Python; tab-width: 4 -*-
# $Id: asynchat.py,v 1.5 1999/01/18 22:43:43 amos Exp $ # $Id: asynchat.py,v 1.6 1999/02/05 02:14:39 amos Exp $
# Author: Sam Rushing <rushing@nightmare.com> # Author: Sam Rushing <rushing@nightmare.com>
# ====================================================================== # ======================================================================
...@@ -118,7 +118,8 @@ class async_chat (asyncore.dispatcher): ...@@ -118,7 +118,8 @@ class async_chat (asyncore.dispatcher):
# until we have read that much. ac_in_buffer_read tracks # until we have read that much. ac_in_buffer_read tracks
# how much data has been read. # how much data has been read.
if type(terminator)==types.IntType: if type(terminator)==types.IntType:
self.ac_in_buffer_read=self.ac_in_buffer_read+len(data) self.ac_in_buffer_read=self.ac_in_buffer_read + \
len(self.ac_in_buffer)
if self.ac_in_buffer_read < self.terminator: if self.ac_in_buffer_read < self.terminator:
self.collect_incoming_data(self.ac_in_buffer) self.collect_incoming_data(self.ac_in_buffer)
self.ac_in_buffer='' self.ac_in_buffer=''
...@@ -132,8 +133,9 @@ class async_chat (asyncore.dispatcher): ...@@ -132,8 +133,9 @@ class async_chat (asyncore.dispatcher):
self.collect_incoming_data(self.ac_in_buffer[:border]) self.collect_incoming_data(self.ac_in_buffer[:border])
self.ac_in_buffer=self.ac_in_buffer[border:] self.ac_in_buffer=self.ac_in_buffer[border:]
self.ac_in_buffer_read=0 self.ac_in_buffer_read=0
data=''
self.found_terminator() self.found_terminator()
break continue
terminator_len = len(terminator) terminator_len = len(terminator)
# 4 cases: # 4 cases:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7