[Python-checkins] r80226 - in python/trunk: Lib/ftplib.py Misc/NEWS

giampaolo.rodola python-checkins at python.org
Mon Apr 19 23:46:28 CEST 2010


Author: giampaolo.rodola
Date: Mon Apr 19 23:46:28 2010
New Revision: 80226

Log:
Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands

Modified:
   python/trunk/Lib/ftplib.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/ftplib.py
==============================================================================
--- python/trunk/Lib/ftplib.py	(original)
+++ python/trunk/Lib/ftplib.py	Mon Apr 19 23:46:28 2010
@@ -295,6 +295,8 @@
             resp = self.sendport(host, port)
         else:
             resp = self.sendeprt(host, port)
+        if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
+            sock.settimeout(self.timeout)
         return sock
 
     def makepasv(self):
@@ -347,6 +349,8 @@
             if resp[0] != '1':
                 raise error_reply, resp
             conn, sockaddr = sock.accept()
+            if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
+                conn.settimeout(self.timeout)
         if resp[:3] == '150':
             # this is conditional in case we received a 125
             size = parse150(resp)

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Apr 19 23:46:28 2010
@@ -20,6 +20,9 @@
 Library
 -------
 
+- Issue #4814: timeout parameter is now applied also for connections resulting
+  from PORT/EPRT commands.
+
 - Issue #8463: added missing reference to bztar in shutil's documentation.
 
 - Issue #8438: Remove reference to the missing "surrogateescape" encoding


More information about the Python-checkins mailing list