From: Andrew M. Kuchling <amk@amk.ca>
Date: Mon, 10 Mar 2003 15:16:54 +0000 (+0000)
Subject: [Patch #649762] Fix for asynchat endless loop
X-Git-Tag: v2.3c1~1503
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a416341b3067306959397e896bd6b712501bd28c;p=thirdparty%2FPython%2Fcpython.git

[Patch #649762] Fix for asynchat endless loop
When the null string is used as the terminator, it used to be the same
as None, meaning "collect all the data".  In the current code, however, it
falls into an endless loop; this change reverts to the old behavior.
---

diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index 081031a019bb..dfe5ea610f49 100644
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -100,7 +100,7 @@ class async_chat (asyncore.dispatcher):
         while self.ac_in_buffer:
             lb = len(self.ac_in_buffer)
             terminator = self.get_terminator()
-            if terminator is None:
+            if terminator is None or terminator == '':
                 # no terminator, collect it all
                 self.collect_incoming_data (self.ac_in_buffer)
                 self.ac_in_buffer = ''