Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch #1359217: Ignore 2xx response before 150 response.

Browse source 
Will backport to 2.5.
This commit is contained in:
Martin v. Löwis 2006-11-12 18:48:13 +00:00
parent 056dac1bcf
commit 36cbc08f3f
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/ftplib.py
View file

@ -325,6 +325,14 @@ def ntransfercmd(self, cmd, rest=None):
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 @@ def ntransfercmd(self, cmd, rest=None):
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()