aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/syck_hack.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 23:07:48 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 23:07:48 +0000
commit064bf602e0f42a925f470c219962e3a430bc5ca8 (patch)
tree908b5285fcb003da1dafd069cb6f174d203c9205 /lib/rubygems/syck_hack.rb
parent83ed985182c5bbaba2c2a3c32bf1a4ecb6c0edde (diff)
downloadruby-064bf602e0f42a925f470c219962e3a430bc5ca8.tar.gz
* lib/rubygems: Update to RubyGems 1.8.23 which contains security
fixes: RubyGems now disallows redirection from HTTPS to HTTP. RubyGems now verifies SSL connections. See https://github.com/rubygems/rubygems/blob/1.8/History.txt for changes since 1.8.22. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/syck_hack.rb')
-rw-r--r--lib/rubygems/syck_hack.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb
index 065d7b9614..9c6f4a2254 100644
--- a/lib/rubygems/syck_hack.rb
+++ b/lib/rubygems/syck_hack.rb
@@ -16,8 +16,9 @@ module YAML
# well.
if defined? ::Syck
# for tests that change YAML::ENGINE
- remove_const :Syck if const_defined? :Syck, false
-
+ # 1.8 does not support the second argument to const_defined?
+ remove_const :Syck rescue nil
+
Syck = ::Syck
# JRuby's "Syck" is called "Yecht"
@@ -38,6 +39,8 @@ module YAML
# should.
module Syck
class DefaultKey
+ remove_method :to_s rescue nil
+
def to_s
'='
end