From: Michael W. Hudson <mwh@python.net>
Date: Fri, 28 Dec 2001 10:11:32 +0000 (+0000)
Subject: Backport Guido's checkin of version 1.61:
X-Git-Tag: v2.2.1c1~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec549fe74529640b7b5492788c9a014678d5a815;p=thirdparty%2FPython%2Fcpython.git

Backport Guido's checkin of version 1.61:

Don't set passiveserver to 0 in connect().  See SF bug #495693.

This should definitely be backported to 2.2.1.  I'll leave it to Jack
to decide whether he wants to fix this in MacPython 2.2.
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 592f5d29d2ca..a176a8737036 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -114,7 +114,6 @@ class FTP:
         - port: port to connect to (integer, default previous port)'''
         if host: self.host = host
         if port: self.port = port
-        self.passiveserver = 0
         msg = "getaddrinfo returns an empty list"
         for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
             af, socktype, proto, canonname, sa = res