FTP: fix compatibility problems with MLSD by removing MLSD support.

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/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 353 matching lines @@
       break;
     case COMMAND_SIZE:
       rv = ProcessResponseSIZE(response);
       break;
     case COMMAND_RETR:
       rv = ProcessResponseRETR(response);
       break;
     case COMMAND_CWD:
       rv = ProcessResponseCWD(response);
       break;
-    case COMMAND_MLSD:
-      rv = ProcessResponseMLSD(response);
-      break;
     case COMMAND_LIST:
       rv = ProcessResponseLIST(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.
   while (ctrl_response_buffer_->ResponseAvailable() && rv == OK) {
     response = ctrl_response_buffer_->PopResponse();
 
     switch (command_sent_) {
       case COMMAND_RETR:
         rv = ProcessResponseRETR(response);
         break;
-      case COMMAND_MLSD:
-        rv = ProcessResponseMLSD(response);
-        break;
       case COMMAND_LIST:
         rv = ProcessResponseLIST(response);
         break;
       default:
         // Multiple responses for other commands are invalid.
         return Stop(ERR_INVALID_RESPONSE);
     }
   }
 
   return rv;
@@ skipping 156 matching lines @@
         rv = DoCtrlWriteRETR();
         break;
       case STATE_CTRL_WRITE_SIZE:
         DCHECK(rv == OK);
         rv = DoCtrlWriteSIZE();
         break;
       case STATE_CTRL_WRITE_CWD:
         DCHECK(rv == OK);
         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_QUIT:
         DCHECK(rv == OK);
         rv = DoCtrlWriteQUIT();
         break;
       case STATE_DATA_CONNECT:
         DCHECK(rv == OK);
@@ skipping 476 matching lines @@
 }
 
 int FtpNetworkTransaction::ProcessResponseCWD(const FtpCtrlResponse& response) {
   // We should never issue CWD if we know the target resource is a file.
   DCHECK_NE(RESOURCE_TYPE_FILE, resource_type_);
 
   switch (GetErrorClass(response.status_code)) {
     case ERROR_CLASS_INITIATED:
       return Stop(ERR_INVALID_RESPONSE);
     case ERROR_CLASS_OK:
-      next_state_ = STATE_CTRL_WRITE_MLSD;
+      next_state_ = STATE_CTRL_WRITE_LIST;
       break;
     case ERROR_CLASS_INFO_NEEDED:
       return Stop(ERR_INVALID_RESPONSE);
     case ERROR_CLASS_TRANSIENT_ERROR:
       return Stop(GetNetErrorCodeForFtpResponseCode(response.status_code));
     case ERROR_CLASS_PERMANENT_ERROR:
       if (response.status_code == 550) {
         if (resource_type_ == RESOURCE_TYPE_DIRECTORY) {
           // We're assuming that the resource is a directory, but the server
           // says it's not true. The most probable interpretation is that it
@@ skipping 10 matching lines @@
       }
 
       return Stop(GetNetErrorCodeForFtpResponseCode(response.status_code));
     default:
       NOTREACHED();
       return Stop(ERR_UNEXPECTED);
   }
   return OK;
 }
 
-// MLSD command
-int FtpNetworkTransaction::DoCtrlWriteMLSD() {
-  next_state_ = STATE_CTRL_READ;
-  return SendFtpCommand("MLSD", COMMAND_MLSD);
-}
-
-int FtpNetworkTransaction::ProcessResponseMLSD(
-    const FtpCtrlResponse& response) {
-  switch (GetErrorClass(response.status_code)) {
-    case ERROR_CLASS_INITIATED:
-      // We want the client to start reading the response at this point.
-      // It got here either through Start or RestartWithAuth. We want that
-      // method to complete. Not setting next state here will make DoLoop exit
-      // and in turn make Start/RestartWithAuth complete.
-      response_.is_directory_listing = true;
-      break;
-    case ERROR_CLASS_OK:
-      response_.is_directory_listing = true;
-      next_state_ = STATE_CTRL_WRITE_QUIT;
-      break;
-    case ERROR_CLASS_INFO_NEEDED:
-      return Stop(ERR_INVALID_RESPONSE);
-    case ERROR_CLASS_TRANSIENT_ERROR:
-    case ERROR_CLASS_PERMANENT_ERROR:
-      // Fallback to the LIST command, more widely supported,
-      // but without a specified output format.
-      next_state_ = STATE_CTRL_WRITE_LIST;
-      break;
-    default:
-      NOTREACHED();
-      return Stop(ERR_UNEXPECTED);
-  }
-  return OK;
-}
-
 // LIST command
 int FtpNetworkTransaction::DoCtrlWriteLIST() {
   std::string command(system_type_ == SYSTEM_TYPE_VMS ? "LIST *.*;0" : "LIST");
   next_state_ = STATE_CTRL_READ;
   return SendFtpCommand(command, COMMAND_LIST);
 }
 
 int FtpNetworkTransaction::ProcessResponseLIST(
     const FtpCtrlResponse& response) {
   switch (GetErrorClass(response.status_code)) {
@@ skipping 184 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