fix multiple reported issues

xakml · May 2, 2018 · ac6ef5c · ac6ef5c
1 parent ffe0de3
commit ac6ef5c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/FluentFTP/Client/FtpClient_Connection.cs b/FluentFTP/Client/FtpClient_Connection.cs
@@ -1765,7 +1765,8 @@ private string GetAbsolutePath(string path) {
 				else
 					path = "./";
 
-			} else if (!path.StartsWith("/")) {
+			// FIX : #153 ensure this check works with unix & windows
+			} else if (!path.StartsWith("/") && path.Substring(1, 1) != ":") {
 
 				// if relative path given then add working dir to calc full path
 				string pwd = GetWorkingDirectory();

diff --git a/FluentFTP/Client/FtpClient_LowLevel.cs b/FluentFTP/Client/FtpClient_LowLevel.cs
@@ -1379,7 +1379,9 @@ protected void SetDataType(FtpDataType type) {
 #if !CORE14
 			lock (m_lock) {
 #endif
-				this.SetDataTypeInternal(type);
+				// FIX : #291 only change the data type if different
+				if (CurrentDataType != type)
+					this.SetDataTypeInternal(type);
 #if !CORE14
 			}
 #endif

diff --git a/FluentFTP/Stream/FtpSocketStream.cs b/FluentFTP/Stream/FtpSocketStream.cs
@@ -97,6 +97,10 @@ public bool IsConnected {
 
 					if (m_socketPollInterval > 0 && DateTime.Now.Subtract(m_lastActivity).TotalMilliseconds > m_socketPollInterval) {
 						FtpTrace.WriteStatus(FtpTraceLevel.Verbose, "Testing connectivity using Socket.Poll()...");
+
+						// FIX : #273 update m_lastActivity to the current time
+						m_lastActivity = DateTime.Now;
+
 						if (m_socket.Poll(500000, SelectMode.SelectRead) && m_socket.Available == 0) {
 							Close();
 							return false;

diff --git a/README.md b/README.md
@@ -1338,11 +1338,16 @@ This is not a bug in FluentFTP. RFC959 says that EOF on stream mode transfers is
 
 ## Release Notes
 
+#### 19.2.0
+- Fix: Prevent socket poll from hammering the server multiple times per second
+- Fix: Allow using absolute paths that include drive letters (Windows servers)
+- Performance improvement: Only change the FTP data type if different from required type
+
 #### 19.1.4
 - Fix: Fix hang in TLS activation because no timeout is set on the underlying NetworkStream (thanks @iamjay)
 
 #### 19.1.3
-- Fix: Added async versions of FTP methods to IFtpClient (thanks @peterfortuin)
+- Added async versions of FTP methods to IFtpClient (thanks @peterfortuin)
 - Fix: Fixes when ActivePorts is specified in active FTP mode (thanks @ToniMontana)
 - Fix: Throw OperationCanceledException instead of FtpException when cancellation is requested (thanks @taoyouh)