summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-15 19:56:19 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-15 19:56:19 +0000
commit94231bdf7966a47b94ba0df0d1725d661348d6d6 (patch)
treeefd0147b3372b9caa5d80913225b3d4d59529442 /test
parent38e722f741c628bd6dbfbd74c8e191beeb460203 (diff)
merge revision(s) 55579: [Backport #12556]
* lib/net/ftp.rb (putline): raise an ArgumentError when CR or LF is included in a line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/net/ftp/test_ftp.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index 4759772cb1..ca71a918e0 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -1633,6 +1633,16 @@ EOF
end
end
+ def test_putline_reject_crlf
+ ftp = Net::FTP.new
+ assert_raise(ArgumentError) do
+ ftp.send(:putline, "\r")
+ end
+ assert_raise(ArgumentError) do
+ ftp.send(:putline, "\n")
+ end
+ end
+
private
def create_ftp_server(sleep_time = nil)