Issue 4929: Handle socket errors when receiving

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index afa38bc7f43986f4d08c6a773037f0274c49bb15..69d7f71d96ab1f1a11865c7bac3b7d6057b09b61 100755 (executable)
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -334,7 +334,10 @@ class SMTP:
         if self.file is None:
             self.file = self.sock.makefile('rb')
         while 1:
-            line = self.file.readline()
+            try:
+                line = self.file.readline()
+            except socket.error:
+                line = ''
             if line == '':
                 self.close()
                 raise SMTPServerDisconnected("Connection unexpectedly closed")