summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 03:17:25 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 03:17:25 +0000
commitea0bf82630a1aa8ad6c56b9d50c297ba1aab6fb5 (patch)
tree0f59cbd0eeffd43bfe5a3b88db25f0fe8004c52b /ChangeLog
parent5ff287ad67935ac4646beafaf8d9e31884917345 (diff)
merge revision(s) 46457,46458: [Backport #9949]
* lib/net/ftp.rb (gets, readline): read lines without LF properly. [ruby-core:63205] [Bug #9949] * test/net/ftp/test_buffered_socket.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fcfc200df3..aad281a7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 7 12:16:54 2014 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (gets, readline): read lines without LF properly.
+ [ruby-core:63205] [Bug #9949]
+
+ * test/net/ftp/test_buffered_socket.rb: related test.
+
Mon Jul 7 12:13:09 2014 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body