Merged revisions 80226 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80226 | giampaolo.rodola | 2010-04-19 23:46:28 +0200 (lun, 19 apr 2010) | 1 line

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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index c8eb078ba3967b186380e90a6c2c77010ac330ec..a0c35784cba3b438fe7c29407bb2b60e987d0a76 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -297,6 +297,8 @@ class FTP:
             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):
@@ -349,6 +351,8 @@ class FTP:
             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)

diff --git a/Misc/NEWS b/Misc/NEWS
index db9cb0515d530506614f32a0770a5d5f302c0f7b..4657757df434bddb895b64c28ccf579c91467207 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -318,6 +318,9 @@ C-API
 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 #7154: urllib.request can now detect the proxy settings on OSX 10.6