Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
........
This commit is contained in:
Giampaolo Rodolà 2010-04-19 22:05:54 +00:00
parent 10a51afc80
commit 5fb313bb04
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/ftplib.py
View File

@ -297,6 +297,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):
@ -349,6 +351,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

@ -318,6 +318,9 @@ C-API
Library 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 #8463: added missing reference to bztar in shutil's documentation.
- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 - Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6