summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Reifscheider <jafo@tummy.com>2008-03-20 00:46:50 (GMT)
committerSean Reifscheider <jafo@tummy.com>2008-03-20 00:46:50 (GMT)
commitac2ed1e0acbee5e293a6da351b1eaadd7b5a6bfc (patch)
treebeee14a04f7a5ab9675728321bf097aed48d4abc
parenta5cfcad0e35e394adb5d25a5f5fbc3065fea5b85 (diff)
downloadcpython-ac2ed1e0acbee5e293a6da351b1eaadd7b5a6bfc.zip
cpython-ac2ed1e0acbee5e293a6da351b1eaadd7b5a6bfc.tar.gz
cpython-ac2ed1e0acbee5e293a6da351b1eaadd7b5a6bfc.tar.bz2
Issue #2143: Fix embedded readline() hang on SSL socket EOF.
-rwxr-xr-xLib/smtplib.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 75093ae..c1b1bec 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -175,6 +175,7 @@ else:
chr = None
while chr != "\n":
chr = self.sslobj.read(1)
+ if not chr: break
str += chr
return str