From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Sun, 18 Apr 2010 13:23:21 +0000 (+0000)
Subject: Fix Issue #3817: 225 is now considered a valid response code for ABOR
X-Git-Tag: v3.1.3rc1~930
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22357e1e01c5ae38b43ef9c048be3fdd25703579;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 7e678b4cbe12..bcfa652a66ec 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -236,7 +236,7 @@ class FTP:
         if self.debugging > 1: print('*put urgent*', self.sanitize(line))
         self.sock.sendall(line, MSG_OOB)
         resp = self.getmultiline()
-        if resp[:3] not in ('426', '226'):
+        if resp[:3] not in ('426', '225', '226'):
             raise error_proto(resp)
 
     def sendcmd(self, cmd):
diff --git a/Misc/NEWS b/Misc/NEWS
index 21e5e3c5e8df..a5cbc87ce530 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response
+  code as stated in RFC-959 at chapter 5.4.
+
 - Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with
   surrogates.