diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-19 21:56:45 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-04-19 21:56:45 (GMT) |
| commit | a2eb7f632bf0f8de68cebd9f0935efa2fe27dae1 (patch) | |
| tree | 52a6b364a76391728591284e3fe1d7d1a9373780 /Lib | |
| parent | b890b66e534df6105b165ebdbad6af6fca168bfd (diff) | |
| download | cpython-a2eb7f632bf0f8de68cebd9f0935efa2fe27dae1.zip cpython-a2eb7f632bf0f8de68cebd9f0935efa2fe27dae1.tar.gz cpython-a2eb7f632bf0f8de68cebd9f0935efa2fe27dae1.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 c0cfe27..22decb2 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -294,6 +294,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): @@ -346,6 +348,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) |