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

Fix Issue #3817: 225 is now considered a valid response code for ABOR

This commit is contained in:
Giampaolo Rodolà 2010-04-18 12:55:03 +00:00
parent 5ac74168b9
commit cf445fced4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/ftplib.py
View File

@ -235,7 +235,7 @@ class FTP:
if self.debugging > 1: print '*put urgent*', self.sanitize(line) if self.debugging > 1: print '*put urgent*', self.sanitize(line)
self.sock.sendall(line, MSG_OOB) self.sock.sendall(line, MSG_OOB)
resp = self.getmultiline() resp = self.getmultiline()
if resp[:3] not in ('426', '226'): if resp[:3] not in ('426', '225', '226'):
raise error_proto, resp raise error_proto, resp
def sendcmd(self, cmd): def sendcmd(self, cmd):

3
Misc/NEWS
View File

@ -18,6 +18,9 @@ Core and Builtins
Library Library
------- -------
- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response
code as stated in RFC-959 at chapter 5.4.
- Issue #8279: Fix test_gdb failures. - Issue #8279: Fix test_gdb failures.
- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the - Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the