diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 22:07:59 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-13 22:07:59 +0000 |
| commit | e256dca8b24d225680809c123335c6b9bd69ae05 (patch) | |
| tree | 0aa3d365167be1ebda54c942129bdcc1d1844915 /lib | |
| parent | 9476346ef5a6d486f8894e45a88ac8e96be14168 (diff) | |
* Backport r39213 from trunk [ruby-trunk - Bug #7383]
* lib/rubygems.rb: Return BINARY strings from Gem.gzip and Gem.gunzip.
Fixes intermittent test failures. RubyGems issue #450 by Jeremey
Kemper.
* test/rubygems/test_gem.rb: Test for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 039d26c1fe..177774376e 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -475,7 +475,9 @@ module Gem require 'zlib' data = StringIO.new data - Zlib::GzipReader.new(data).read + unzipped = Zlib::GzipReader.new(data).read + unzipped.force_encoding Encoding::BINARY if Object.const_defined? :Encoding + unzipped end ## @@ -486,6 +488,7 @@ module Gem require 'stringio' require 'zlib' zipped = StringIO.new + zipped.set_encoding Encoding::BINARY if Object.const_defined? :Encoding Zlib::GzipWriter.wrap zipped do |io| io.write data end |