Releasing v1/1/7, Resolves #5 (eventually)

sparkeh9 · Nov 14, 2016 · b93980e · b93980e
1 parent d76b429
commit b93980e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.1.6-{build}
+version: 1.1.7-{build}
 pull_requests:
   do_not_increment_build_number: true
 configuration: Release

diff --git a/src/CoreFtp/FtpClient.cs b/src/CoreFtp/FtpClient.cs
@@ -639,9 +639,15 @@ internal async Task<Socket> ConnectDataSocketAsync()
             Socket socket = null;
             try
             {
-                Logger?.LogDebug( $"Connecting data socket, {configuration.Host}:{passivePortNumber}" );
-                socket = new Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp );
-                socket.Connect( configuration.Host, passivePortNumber.Value );
+                Logger?.LogDebug( $"Connecting data socket, {configuration.Host}:{passivePortNumber.Value}" );
+
+                var ipEndpoint = await dnsResolver.ResolveAsync( configuration.Host, passivePortNumber.Value, configuration.IpVersion );
+
+                socket = new Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp )
+                {
+                    ReceiveTimeout = configuration.TimeoutSeconds * 1000
+                };
+                socket.Connect( ipEndpoint );
 
                 return socket;
             }

diff --git a/src/CoreFtp/project.json b/src/CoreFtp/project.json
@@ -1,6 +1,6 @@
 {
     "title": "CoreFTP",
-    "version": "1.1.6-*",
+    "version": "1.1.7-*",
     "copyright": "Nick Briscoe 2016",
     "language": "en",
     "packOptions": {