summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-09 07:28:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-09 07:28:56 +0000
commit7d7ed2c23116b8f2c0bfcd902eaf8a2a15301bb3 (patch)
treeaa7dd693fc57a981ef3e2c048b6a9357b3b5cdae /ChangeLog
parent16b551feb5b9b110eb3a4c6528e8fea1e0a174b5 (diff)
merge revision(s) 50646: [Backport #11185]
* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode, ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile [ruby-core:69371] [Bug #11185] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9278a79037..6c87c34e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 9 16:26:48 2015 Eric Wong <e@80x24.org>
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+ ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile
+ [ruby-core:69371] [Bug #11185]
+
Tue Jun 9 16:24:25 2015 NARUSE, Yui <naruse@ruby-lang.org>
* win32/win32.c (setup_overlapped): seek to the file end only when