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/Misc/NEWS b/Misc/NEWS
index db9cb05..4657757 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -318,6 +318,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 #7154: urllib.request can now detect the proxy settings on OSX 10.6