summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-21 05:16:26 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-05-21 05:16:26 +0000
commit3a312317e68a8365edbd71cda5729c3d08d27bbb (patch)
tree5ca2939be3214ffa053313689a05e0c156e3bfe8 /ChangeLog
parent7944b62832cf666282fd605089c4bc170387cee3 (diff)
merge revision(s) 50449: [Backport #11123]
* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard [Bug #11123] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50584 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 bcd9038183..1ae98c2de3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 21 14:15:10 2015 Eric Wong <e@80x24.org>
+
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+ [Bug #11123]
+
Thu May 21 14:11:50 2015 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp