[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 081031a019bbf96136ad4ce872b45fe0f1ef3d6a..dfe5ea610f49c7b73634f5f9715322fda5805843 100644 (file)
--- 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 = ''