diff options
| -rw-r--r-- | Lib/ftplib.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 7 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) @@ -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 |