diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 21:06:36 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 21:06:36 +0000 |
| commit | 7266d24aa0e1289fe45de79d87bda0051bb75b85 (patch) | |
| tree | dc9fd8b53646491717571871141fefcc4dc3e29e /lib/rubygems.rb | |
| parent | d1691db91ee27148445189e173ab1f1f500e533d (diff) | |
* 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/trunk@39213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
| -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 |