From: Barry Warsaw <barry@python.org>
Date: Wed, 8 Nov 2000 22:19:47 +0000 (+0000)
Subject: SMTP.connect(): If the socket.connect() raises a socket.error, be sure
X-Git-Tag: v2.1a1~752
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17bfef5860493a0195c999ab44d4c849660cac30;p=python

SMTP.connect(): If the socket.connect() raises a socket.error, be sure
to call self.close() to reclaim some file descriptors, the reraise the
exception.  Closes SF patch #102185 and SF bug #119833.
---

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 6536371846..77cd22304c 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -214,7 +214,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)