aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/http.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d6fca280c..6c171c0774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 11 20:20:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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
+
Mon Oct 11 17:42:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
* error.c (syserr_initialize): use mesg's encoding when locale
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 0ae1ba8c8f..a4e2cee8e5 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);