summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-15 22:50:46 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-15 22:50:46 +0000
commitd23a588b22bd01d925d846a7f84542a116358799 (patch)
tree75ef16c6e10119c054e04bc7e1eeff6dc614fc3e
parent8cdf5c417993f453149365f76c46f28e0bb4fa8f (diff)
merge revision(s) r32583:
* ChangeLog: fix typo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28e5cb6a04..a271e16033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2576,7 +2576,7 @@ Thu Jul 14 12:40:07 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
* ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
verify callback of SSLContext and X509Store and make the
verification fail normally. Raising exception directly from callback
- causes orphan resouces in OpenSSL stack. Patched by Ippei Obayashi.
+ causes orphan resources in OpenSSL stack. Patched by Ippei Obayashi.
See #4445.
* test/openssl/test_ssl.rb