[Python-checkins] r80229 - in python/branches/release31-maint: Lib/ftplib.py Misc/NEWS

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Tue Apr 20 00:10:56 2010
New Revision: 80229

Log:
Merged revisions 80228 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80228 | giampaolo.rodola | 2010-04-20 00:05:54 +0200 (mar, 20 apr 2010) | 9 lines
  
  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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/ftplib.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/ftplib.py
==============================================================================
--- python/branches/release31-maint/Lib/ftplib.py	(original)
+++ python/branches/release31-maint/Lib/ftplib.py	Tue Apr 20 00:10:56 2010
@@ -296,6 +296,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):
@@ -348,6 +350,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/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Apr 20 00:10:56 2010
@@ -33,6 +33,9 @@
 Library
 -------
 
+- Issue #4814: timeout parameter is now applied also for connections resulting
+  from PORT/EPRT commands.
+
 - Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response
   code as stated in RFC-959 at chapter 5.4.