merge revision(s) 53810: [Backport ruby#12044]

unak · unak · commit fb28e643423b · 2016-03-25T09:31:25.000Z
* net/ftp.rb: add NullSocket#closed? to fix closing not opened connection. [Fix rubyGH-1232] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 18:30:55 2016  Anthony Dmitriyev  <antstorm@gmail.com>
+
+	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
+	  connection.  [Fix GH-1232]
+
 Fri Mar 25 18:26:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (num_step_scan_args): comparison String with Numeric
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
@@ -1070,6 +1070,10 @@ class NullSocket
       def read_timeout=(sec)
       end
 
+      def closed?
+        true
+      end
+
       def close
       end
 
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
@@ -23,6 +23,14 @@ def test_not_connected
     end
   end
 
+  def test_closed_when_not_connected
+    ftp = Net::FTP.new
+    assert_equal(true, ftp.closed?)
+    assert_nothing_raised(Net::FTPConnectionError) do
+      ftp.close
+    end
+  end
+
   def test_connect_fail
     server = create_ftp_server { |sock|
       sock.print("421 Service not available, closing control connection.\r\n")
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 474
+#define RUBY_PATCHLEVEL 475
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
