Index: Lib/smtplib.py
===================================================================
--- Lib/smtplib.py	(revision 68570)
+++ Lib/smtplib.py	(working copy)
@@ -334,7 +334,10 @@
         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")