From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Sun, 18 Apr 2010 12:55:03 +0000 (+0000)
Subject: Fix Issue #3817: 225 is now considered a valid response code for ABOR
X-Git-Tag: v2.7b2~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf445fced474f4df3b67ec3cb4ae6f761173d93c;p=python

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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ad00e310bd..31ac526957 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -235,7 +235,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 bc6ccf1cf1..ca953c8836 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,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 #8279: Fix test_gdb failures.
 
 - Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the