FTP: change order of commands to improve compatibility

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 2010 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/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 316 matching lines @@
       break;
     case COMMAND_CWD:
       rv = ProcessResponseCWD(response);
       break;
     case COMMAND_MLSD:
       rv = ProcessResponseMLSD(response);
       break;
     case COMMAND_LIST:
       rv = ProcessResponseLIST(response);
       break;
-    case COMMAND_MDTM:
-      rv = ProcessResponseMDTM(response);
-      break;
     case COMMAND_QUIT:
       rv = ProcessResponseQUIT(response);
       break;
     default:
       LOG(DFATAL) << "Unexpected value of command_sent_: " << command_sent_;
       return ERR_UNEXPECTED;
   }
 
   // We may get multiple responses for some commands,
   // see http://crbug.com/18036.
@@ skipping 195 matching lines @@
         rv = DoCtrlWriteCWD();
         break;
       case STATE_CTRL_WRITE_MLSD:
         DCHECK(rv == 0);
         rv = DoCtrlWriteMLSD();
         break;
       case STATE_CTRL_WRITE_LIST:
         DCHECK(rv == OK);
         rv = DoCtrlWriteLIST();
         break;
-      case STATE_CTRL_WRITE_MDTM:
-        DCHECK(rv == OK);
-        rv = DoCtrlWriteMDTM();
-        break;
       case STATE_CTRL_WRITE_QUIT:
         DCHECK(rv == OK);
         rv = DoCtrlWriteQUIT();
         break;
       case STATE_DATA_CONNECT:
         DCHECK(rv == OK);
         rv = DoDataConnect();
         break;
       case STATE_DATA_CONNECT_COMPLETE:
         rv = DoDataConnectComplete(rv);
@@ skipping 429 matching lines @@
         return Stop(ERR_INVALID_RESPONSE);
       if (size < 0)
         return Stop(ERR_INVALID_RESPONSE);
       response_.expected_content_size = size;
       break;
     case ERROR_CLASS_INFO_NEEDED:
       break;
     case ERROR_CLASS_TRANSIENT_ERROR:
       break;
     case ERROR_CLASS_PERMANENT_ERROR:
+      // It's possible that SIZE failed because the path is a directory.
+      if (response.status_code == 550 &&
+          resource_type_ == RESOURCE_TYPE_UNKNOWN) {
+        resource_type_ = RESOURCE_TYPE_DIRECTORY;
+      } else if (resource_type_ != RESOURCE_TYPE_DIRECTORY) {
+        return Stop(ERR_FAILED);

[wtc, 2010/07/07 23:52:46]

Nit: Can we return a better error code than ERR_FAILED here?

+      }
       break;
     default:
       NOTREACHED();
       return Stop(ERR_UNEXPECTED);
   }
-  next_state_ = STATE_CTRL_WRITE_MDTM;
+
+  if (resource_type_ == RESOURCE_TYPE_DIRECTORY)
+    next_state_ = STATE_CTRL_WRITE_CWD;
+  else
+    next_state_ = STATE_CTRL_WRITE_RETR;
+
   return OK;
 }
 
 // RETR command
 int FtpNetworkTransaction::DoCtrlWriteRETR() {
   std::string command = "RETR " + GetRequestPathForFtpCommand(false);
   next_state_ = STATE_CTRL_READ;
   return SendFtpCommand(command, COMMAND_RETR);
 }
 
@@ skipping 31 matching lines @@
       // See http://crbug.com/25316.
       next_state_ = use_epsv_ ? STATE_CTRL_WRITE_EPSV : STATE_CTRL_WRITE_PASV;
       break;
     default:
       NOTREACHED();
       return Stop(ERR_UNEXPECTED);
   }
   return OK;
 }
 
-// MDMT command
-int FtpNetworkTransaction::DoCtrlWriteMDTM() {
-  std::string command = "MDTM " + GetRequestPathForFtpCommand(false);
-  next_state_ = STATE_CTRL_READ;
-  return SendFtpCommand(command, COMMAND_MDTM);
-}
-
-int FtpNetworkTransaction::ProcessResponseMDTM(
-    const FtpCtrlResponse& response) {
-  switch (GetErrorClass(response.status_code)) {
-    case ERROR_CLASS_INITIATED:
-      return Stop(ERR_FAILED);
-    case ERROR_CLASS_OK:
-      next_state_ = STATE_CTRL_WRITE_RETR;
-      break;
-    case ERROR_CLASS_INFO_NEEDED:
-      return Stop(ERR_FAILED);
-    case ERROR_CLASS_TRANSIENT_ERROR:
-      return Stop(ERR_FAILED);
-    case ERROR_CLASS_PERMANENT_ERROR:
-      next_state_ = STATE_CTRL_WRITE_RETR;
-      break;
-    default:
-      NOTREACHED();
-      return Stop(ERR_UNEXPECTED);
-  }
-  return OK;
-}
-
-
 // CWD command
 int FtpNetworkTransaction::DoCtrlWriteCWD() {
   std::string command = "CWD " + GetRequestPathForFtpCommand(true);
   next_state_ = STATE_CTRL_READ;
   return SendFtpCommand(command, COMMAND_CWD);
 }
 
 int FtpNetworkTransaction::ProcessResponseCWD(const FtpCtrlResponse& response) {
   switch (GetErrorClass(response.status_code)) {
     case ERROR_CLASS_INITIATED:
@@ skipping 114 matching lines @@
   if (rv != OK)
     return Stop(rv);
   data_address.SetPort(data_connection_port_);
   data_socket_.reset(socket_factory_->CreateTCPClientSocket(
         data_address, net_log_.net_log()));
   return data_socket_->Connect(&io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataConnectComplete(int result) {
   RecordDataConnectionError(result);
-  if (resource_type_ == RESOURCE_TYPE_DIRECTORY) {
-    next_state_ = STATE_CTRL_WRITE_CWD;
-  } else {
-    next_state_ = STATE_CTRL_WRITE_SIZE;
-  }
+  next_state_ = STATE_CTRL_WRITE_SIZE;
   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). The half-closed TCP connection needs
@@ skipping 101 matching lines @@
   if (!had_error_type[type]) {
     had_error_type[type] = true;
     UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorHappened",
         type, NUM_OF_NET_ERROR_TYPES);
   }
   UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorCount",
       type, NUM_OF_NET_ERROR_TYPES);
 }
 
 }  // namespace net