[Python-checkins] r52739 - in python/trunk: Lib/ftplib.py Misc/NEWS

Sun Nov 12 19:48:14 CET 2006

Author: martin.v.loewis
Date: Sun Nov 12 19:48:13 2006
New Revision: 52739
Modified:
 python/trunk/Lib/ftplib.py
 python/trunk/Misc/NEWS
Log:
Patch #1359217: Ignore 2xx response before 150 response.
Will backport to 2.5.
Modified: python/trunk/Lib/ftplib.py
==============================================================================

--- python/trunk/Lib/ftplib.py	(original)
+++ python/trunk/Lib/ftplib.py	Sun Nov 12 19:48:13 2006
@@ -325,6 +325,14 @@
 if rest is not None:
 self.sendcmd("REST %s" % rest)
 resp = self.sendcmd(cmd)
+ # Some servers apparently send a 200 reply to
+ # a LIST or STOR command, before the 150 reply
+ # (and way before the 226 reply). This seems to
+ # be in violation of the protocol (which only allows
+ # 1xx or error messages for LIST), so we just discard
+ # this response.
+ if resp[0] == '2':
+ resp = self.getresp()
 if resp[0] != '1':
 raise error_reply, resp
 else:
@@ -332,6 +340,9 @@
 if rest is not None:
 self.sendcmd("REST %s" % rest)
 resp = self.sendcmd(cmd)
+ # See above.
+ if resp[0] == '2':
+ resp = self.getresp()
 if resp[0] != '1':
 raise error_reply, resp
 conn, sockaddr = sock.accept()
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Nov 12 19:48:13 2006
@@ -98,6 +98,9 @@
 Library
 -------
 
+- Patch #1359217: Process 2xx response in an ftplib transfer
+ that precedes an 1xx response.
+
 - Patch #1355023: support whence argument for GzipFile.seek.
 
 - Patch #1065257: Support passing open files as body in 
