]> granicus.if.org Git - python/commit
Merged revisions 80226 via svnmerge from
authorGiampaolo Rodolà <g.rodola@gmail.com>
Mon, 19 Apr 2010 22:05:54 +0000 (22:05 +0000)
committerGiampaolo Rodolà <g.rodola@gmail.com>
Mon, 19 Apr 2010 22:05:54 +0000 (22:05 +0000)
commit5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47
tree8fec969dd82ba55f15a291bd1ad6af6d70247aed
parent10a51afc807195706af20c29e87c4a56c62737ac
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
........
Lib/ftplib.py
Misc/NEWS