From fa28f0052adffd60e14dce4197126a76ffab089b Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Tue, 31 Oct 2000 16:40:10 +0000
Subject: connect(): Wrap the sock.connect() in a try/except so that if the
 connection fails with a socket.error, the file descriptors are reclaimed.

---
 Mailman/pythonlib/smtplib.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Mailman/pythonlib/smtplib.py')

diff --git a/Mailman/pythonlib/smtplib.py b/Mailman/pythonlib/smtplib.py
index 4f6a00d3b..0ac6018e9 100755
--- a/Mailman/pythonlib/smtplib.py
+++ b/Mailman/pythonlib/smtplib.py
@@ -231,7 +231,11 @@ class SMTP:
         if not port: port = SMTP_PORT
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         if self.debuglevel > 0: print 'connect:', (host, port)
-        self.sock.connect((host, port))
+        try:
+            self.sock.connect((host, port))
+        except socket.error:
+            self.close()
+            raise
         (code,msg)=self.getreply()
         if self.debuglevel >0 : print "connect:", msg
         return (code,msg)
-- 
cgit v1.2.3-70-g09d2