diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:35 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:35 +0000 |
| commit | f099a11c2a55d4a00338bb494cb072bbf5f3c299 (patch) | |
| tree | 5428933e05e56c4a538a1cdba1d3167539325575 /lib | |
| parent | dcc316b825abf8b9b975e6318b7aef904d686801 (diff) | |
merges r29442 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
encoding of Zlib::GzipReader.
http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index f39451591f..d4329e53c3 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -883,7 +883,7 @@ module Net #:nodoc: the_body = r.read_body dest, &block case r["content-encoding"] when "gzip" - r.body= Zlib::GzipReader.new(StringIO.new(the_body)).read + r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding: "ASCII-8BIT").read r.delete("content-encoding") when "deflate" r.body= Zlib::Inflate.inflate(the_body); |