From e7cedf88caba8bec3f73c5dca9da6b8d594c4e7c Mon Sep 17 00:00:00 2001 From: Gonzalo Paniagua Javier Date: Fri, 16 Jan 2009 15:39:32 +0000 Subject: [PATCH] 2009-01-16 Gonzalo Paniagua Javier * FtpWebRequest.cs: adjust to the correct directory when listing too. Fixes bug #466530. svn path=/branches/mono-2-2/mcs/; revision=123615 --- mcs/class/System/System.Net/ChangeLog | 5 +++++ mcs/class/System/System.Net/FtpWebRequest.cs | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog index f649d185492..2ee287e4ed8 100644 --- a/mcs/class/System/System.Net/ChangeLog +++ b/mcs/class/System/System.Net/ChangeLog @@ -1,3 +1,8 @@ +2009-01-16 Gonzalo Paniagua Javier + + * FtpWebRequest.cs: adjust to the correct directory when listing too. + Fixes bug #466530. + 2009-01-15 Gonzalo Paniagua Javier * HttpListenerRequest.cs: always initialize 'version'. diff --git a/mcs/class/System/System.Net/FtpWebRequest.cs b/mcs/class/System/System.Net/FtpWebRequest.cs index 3e48d280bbf..2a23fb94d91 100644 --- a/mcs/class/System/System.Net/FtpWebRequest.cs +++ b/mcs/class/System/System.Net/FtpWebRequest.cs @@ -580,25 +580,20 @@ namespace System.Net ResolveHost (); OpenControlConnection (); + CWDAndSetFileName (requestUri); + SetType (); switch (method) { // Open data connection and receive data case WebRequestMethods.Ftp.DownloadFile: - CWDAndSetFileName (requestUri); - SetType (); - DownloadData (); - break; case WebRequestMethods.Ftp.ListDirectory: case WebRequestMethods.Ftp.ListDirectoryDetails: - SetType (); DownloadData (); break; // Open data connection and send data case WebRequestMethods.Ftp.AppendFile: case WebRequestMethods.Ftp.UploadFile: case WebRequestMethods.Ftp.UploadFileWithUniqueName: - CWDAndSetFileName (requestUri); - SetType (); UploadData (); break; // Get info from control connection @@ -608,8 +603,6 @@ namespace System.Net case WebRequestMethods.Ftp.MakeDirectory: case WebRequestMethods.Ftp.Rename: case WebRequestMethods.Ftp.DeleteFile: - CWDAndSetFileName (requestUri); - SetType (); ProcessSimpleMethod (); break; default: // What to do here? @@ -935,7 +928,8 @@ namespace System.Net Socket s = InitDataConnection (); - if(method != WebRequestMethods.Ftp.UploadFileWithUniqueName) { + if (method != WebRequestMethods.Ftp.ListDirectory && method != WebRequestMethods.Ftp.ListDirectoryDetails && + method != WebRequestMethods.Ftp.UploadFileWithUniqueName) { status = SendCommand (method, file_name); } else { status = SendCommand (method); -- 2.25.1