diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-19 22:05:54 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-19 22:05:54 (GMT) |
| commit | 5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47 (patch) | |
| tree | 8fec969dd82ba55f15a291bd1ad6af6d70247aed /Lib | |
| parent | 10a51afc807195706af20c29e87c4a56c62737ac (diff) | |
| download | cpython-5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47.zip cpython-5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47.tar.gz cpython-5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ftplib.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index c8eb078..a0c3578 100644 --- 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) |