Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/zlib/zlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -3069,7 +3069,7 @@ gzfile_read_all(struct gzfile *gz, VALUE dst)
rb_str_resize(dst, 0);
return dst;
}
return rb_str_new(0, 0);
return rb_enc_str_new(0, 0, gz->enc);
}

dst = zstream_detach_buffer(&gz->z);
Expand Down
14 changes: 14 additions & 0 deletions test/zlib/test_zlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,20 @@ def test_encoding
}
end

def test_read_encoding_at_eof
gz = Zlib.gzip("foo")
Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "EUC-JP") do |f|
enc = f.read.encoding
s = f.read
assert_equal("", s)
assert_equal(enc, s.encoding)
end
Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "Shift_JIS", internal_encoding: "UTF-8") do |f|
f.read
assert_equal(Encoding::UTF_8, f.read.encoding)
end
end

def test_double_close
Tempfile.create("test_zlib_gzip_reader_close") {|t|
t.binmode
Expand Down
Loading