summaryrefslogtreecommitdiffstats
path: root/net/ftp/ftp_network_transaction.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 17:25:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 17:25:12 +0000
commit3374f3ca35055b0bc4abaab15a962a53576fe8fd (patch)
tree0ad06e7cb75c58d7a8d30eb21424d0b0f2e54a10 /net/ftp/ftp_network_transaction.cc
parent3fca660048877077540a8c4c62ae5f1df6e6276d (diff)
downloadchromium_src-3374f3ca35055b0bc4abaab15a962a53576fe8fd.zip
chromium_src-3374f3ca35055b0bc4abaab15a962a53576fe8fd.tar.gz
chromium_src-3374f3ca35055b0bc4abaab15a962a53576fe8fd.tar.bz2
Fix compatibility problems with FileZilla FTP Server.
TEST=Covered by net_unittests. BUG=25316 Review URL: http://codereview.chromium.org/293049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp/ftp_network_transaction.cc')
-rw-r--r--net/ftp/ftp_network_transaction.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index d4820b1..03a1291 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -923,8 +923,10 @@ int FtpNetworkTransaction::ProcessResponseRETR(
retr_failed_ = true;
// It's possible that RETR failed because the path is a directory.
- // Try CWD next, to see if that's the case.
- next_state_ = STATE_CTRL_WRITE_CWD;
+ // We're going to try CWD next, but first send a PASV one more time,
+ // because some FTP servers, including FileZilla, require that.
+ // See http://crbug.com/25316.
+ next_state_ = STATE_CTRL_WRITE_PASV;
break;
default:
NOTREACHED();