summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/lib/openssl/config.rb2
-rw-r--r--test/openssl/test_config.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec714ee6e8..e1035b36be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 16:47:51 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * ext/openssl/lib/openssl/config.rb, test/openssl/test_config.rb:
+ cosmetic changes for 1.9 compatibility; let it run on 1.9 as-is.
+
Sun Aug 15 19:59:58 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 21c98b7b18..9fc42c623a 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -284,7 +284,7 @@ module OpenSSL
def each
@data.each do |section, hash|
hash.each do |key, value|
- yield(section, key, value)
+ yield [section, key, value]
end
end
end
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
index 3104367083..3c21fb1f86 100644
--- a/test/openssl/test_config.rb
+++ b/test/openssl/test_config.rb
@@ -19,7 +19,7 @@ __EOD__
end
def test_constants
- assert(OpenSSL::Config.constants.include?('DEFAULT_CONFIG_FILE'))
+ assert(defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
assert_nothing_raised do
OpenSSL::Config.load(OpenSSL::Config::DEFAULT_CONFIG_FILE)
end