diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 16:06:29 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 16:06:29 +0000 |
commit | 5840a393fb80342e5b389725ab7a9fddcb2189f7 (patch) | |
tree | e386f8610a6d4d0b06e8fce14d4d59e4cf71af3a | |
parent | a2915284495bea277c852c9e57674c98867bac25 (diff) |
merge revision(s) 53810: [Backport #12044]
* net/ftp.rb: add NullSocket#closed? to fix closing not opened
connection. [Fix GH-1232]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/net/ftp.rb | 4 | ||||
-rw-r--r-- | test/net/ftp/test_ftp.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Mar 29 01:05:28 2016 Anthony Dmitriyev <antstorm@gmail.com> + + * net/ftp.rb: add NullSocket#closed? to fix closing not opened + connection. [Fix GH-1232] + Tue Mar 29 01:02:49 2016 Koichi ITO <koic.ito@gmail.com> * variable.c: Added documentation about order of `Module#constants` diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index f513ca6ee8..5b63764625 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1070,6 +1070,10 @@ module Net 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 index eaed3b02da..c0d06bda7e 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -23,6 +23,14 @@ class FTPTest < Test::Unit::TestCase 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") @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 272 +#define RUBY_PATCHLEVEL 273 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |