commit f527940dbd350787472a394b4f9a794367cce9d9
author Giampaolo Rodolà <g.rodola@gmail.com> Mon Apr 19 22:10:56 2010 +0000
committer Giampaolo Rodolà <g.rodola@gmail.com> Mon Apr 19 22:10:56 2010 +0000
tree 6846a1d5436a9c6bfc7e7adffc80a4f938856392
parent ccee3568299a8b34f81649cba88ecc850687e461

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
  ........
................

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index 085edc0..8ae4a65 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.