From 7266d24aa0e1289fe45de79d87bda0051bb75b85 Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 12 Feb 2013 21:06:36 +0000 Subject: * 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 --- lib/rubygems.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/rubygems.rb') 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 -- cgit v1.2.3