From 5fb313bb04dae9bbae82d5ca16ee1cc4e02a5e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Mon, 19 Apr 2010 22:05:54 +0000 Subject: 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 | 4 ++++ Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+) 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) diff --git a/Misc/NEWS b/Misc/NEWS index db9cb05..4657757 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -318,6 +318,9 @@ C-API 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 -- cgit v0.12