commit 50d6f54b1aae4aadf6f080148ec2858663312cd7
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Fri Mar 23 14:33:00 2012 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Fri Mar 23 14:33:00 2012 +0000
tree 55e873c21194724afec58c1f3ef00595f1fb06a7
parent ea605cd1526431380e4b15c2ea58dd81ff18a88d

Closes #14314: backported fix.

Lib/logging/handlers.py

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index d140048..3ff324d 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -868,6 +868,7 @@
         self.toaddrs = toaddrs
         self.subject = subject
         self.secure = secure
+        self._timeout = 5.0
 
     def getSubject(self, record):
         """
@@ -890,7 +891,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,