Merge pull request #12 from wconrad/ruby-2.3

active mode transfers work in ruby-2.3.0
bnix · Jun 15, 2016 · eca9efd · eca9efd
2 parents 535590b + f043219
commit eca9efd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
+## 0.1.3
+
+Bugfixes:
+
+  - Active mode transfers send proper commands with Ruby > 2.2.2
+
 ## 0.1.2
+
 Bugfixes:
 
   - Reuse SSL session when creating new sockets

diff --git a/double_bag_ftps.gemspec b/double_bag_ftps.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "double-bag-ftps"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.license     = "MIT"
   s.author      = "Bryan Nix"
   s.homepage    = "https://github.com/bnix/double-bag-ftps"

diff --git a/lib/double_bag_ftps.rb b/lib/double_bag_ftps.rb
@@ -1,4 +1,5 @@
 require 'net/ftp'
+require 'rubygems'
 begin
   require 'openssl'
 rescue LoadError
@@ -109,6 +110,10 @@ def transfercmd(cmd, rest_offset = nil)
       conn = ssl_socket(conn) # SSL connection now possible after cmd sent
     else
       sock = makeport
+      # Before ruby-2.2.3, makeport did a sendport automatically
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.3")
+        sendport(sock.addr[3], sock.addr[1])
+      end
       if @resume and rest_offset
         resp = sendcmd('REST ' + rest_offset.to_s)
         if resp[0] != ?3