Various cleanups FTP-related.

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "net/ftp/ftp_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/load_log.h"
@@ skipping 847 matching lines @@
         return Stop(ERR_FAILED);
       return ERR_FAILED;  // TODO(ibrar): Retry here.
     case ERROR_CLASS_PERMANENT_ERROR:
       // Code 550 means "Failed to open file". Other codes are unrelated,
       // like "Not logged in" etc.
       if (response.status_code != 550)
         return Stop(ERR_FAILED);
 
       DCHECK(!retr_failed_);  // Should not get here twice.
       retr_failed_ = true;
-      next_state_ = STATE_CTRL_WRITE_PASV;
+
+      // 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;
       break;
     default:
       NOTREACHED();
       return Stop(ERR_UNEXPECTED);
   }
   return OK;
 }
 
 // MDMT command
 int FtpNetworkTransaction::DoCtrlWriteMDTM() {
@@ skipping 137 matching lines @@
   }
   return OK;
 }
 
 int FtpNetworkTransaction::DoDataRead() {
   DCHECK(read_data_buf_);
   DCHECK_GT(read_data_buf_len_, 0);
 
   if (data_socket_ == NULL || !data_socket_->IsConnected()) {
     // If we don't destroy the data socket completely, some servers will wait
-    // for us (http://crbug.com/21127).
+    // for us (http://crbug.com/21127). The half-closed TCP connection needs
+    // to be closed on our side too.
     data_socket_.reset();
 
     // No more data so send QUIT Command now and wait for response.
     return Stop(OK);
   }
 
   next_state_ = STATE_DATA_READ_COMPLETE;
   read_data_buf_->data()[0] = 0;
   return data_socket_->Read(read_data_buf_, read_data_buf_len_,
                             &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataReadComplete(int result) {
   return result;
 }
 
 }  // namespace net