mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 80226 via svnmerge from

Browse source 
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
........
This commit is contained in:
Giampaolo Rodolà 2010-04-19 21:56:45 +00:00
parent b890b66e53
commit a2eb7f632b
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/ftplib.py
View file

@ -294,6 +294,8 @@ class FTP:
resp = self.sendport(host, port) resp = self.sendport(host, port)
else: else:
resp = self.sendeprt(host, port) resp = self.sendeprt(host, port)
if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
sock.settimeout(self.timeout)
return sock return sock
def makepasv(self): def makepasv(self):
@ -346,6 +348,8 @@ class FTP:
if resp[0] != '1': if resp[0] != '1':
raise error_reply, resp raise error_reply, resp
conn, sockaddr = sock.accept() conn, sockaddr = sock.accept()
if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
conn.settimeout(self.timeout)
if resp[:3] == '150': if resp[:3] == '150':
# this is conditional in case we received a 125 # this is conditional in case we received a 125
size = parse150(resp) size = parse150(resp)

3
Misc/NEWS
View file

@ -33,6 +33,9 @@ Core and Builtins
Library Library
------- -------
- Issue #4814: timeout parameter is now applied also for connections resulting
from PORT/EPRT commands.
- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response - Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response
code as stated in RFC-959 at chapter 5.4. code as stated in RFC-959 at chapter 5.4.