summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-14 14:57:11 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-14 14:57:11 +0000
commitf73b6e22cc5ef9befda9a5a1fb2bc8d481ec36ac (patch)
tree8287d71964839c682459db482a27ee4440a44178 /ChangeLog
parenta646156e11474ef5f473d2bd19d317d469717caa (diff)
parente1808b522b0f10c5ae45925a7a1ba5aa3067a2f8 (diff)
add tag v2_3_6
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_3_6@61254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 28c9c706d5..2d26904f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 14 23:53:41 2017 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/net/ftp/test_ftp.rb (process_port_or_eprt): merge a part of
+ r56973 to pass the test introduced at previous commit.
+
Thu Dec 14 22:55:05 2017 Shugo Maeda <shugo@ruby-lang.org>
Fix a command injection vulnerability in Net::FTP.