commit ee64b28cf44c14bfa4f7626357b8d99d2110e404
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Fri Mar 23 14:36:22 2012 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Fri Mar 23 14:36:22 2012 +0000
tree 26b99afc51251ca4a48478005b3de88987496fb9
parent a3481e70d188edf846cac6244ddc7f1178c6ff50

Closes #14314: backported fix.

Lib/logging/handlers.py

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 73ce031..fed8c93 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -857,6 +857,7 @@
         self.toaddrs = toaddrs
         self.subject = subject
         self.secure = secure
+        self._timeout = 5.0
 
     def getSubject(self, record):
         """
@@ -879,7 +880,7 @@
             port = self.mailport
             if not port:
                 port = smtplib.SMTP_PORT
-            smtp = smtplib.SMTP(self.mailhost, port)
+            smtp = smtplib.SMTP(self.mailhost, port, timeout=self._timeout)
             msg = self.format(record)
             msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % (
                             self.fromaddr,