summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-30 14:50:41 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-30 14:50:41 +0000
commit0cc54369d76631b77cded2f5491cdaeb30d33ef0 (patch)
tree5f0a3260acec231cbc834c86aedad12d70a7d6ae /ChangeLog
parentfd2d57979face0e161b9a5aa3122abfe00a4819c (diff)
merge revision(s) r45271: [Backport #9592] [Backport #9670]
* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown error reasons with old OpenSSL, and insert a colon iff formatted message is not empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45472 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 80ecd65154..f5909be542 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 30 23:49:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
+ error reasons with old OpenSSL, and insert a colon iff formatted
+ message is not empty.
+
Thu Mar 20 21:13:18 2014 Eric Wong <e@80x24.org>
* variable.c (rb_const_set): delete existing entry on redefinition