diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 1 | ||||
| -rw-r--r-- | test/zlib/test_zlib.rb | 5 |
3 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Sun Aug 31 08:46:44 2014 Eric Wong <e@80x24.org> + + * ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE + [Bug #10101] + + * test/zlib/test_zlib.rb (test_rewind): test each_byte + Sat Aug 30 19:22:47 2014 Eric Wong <e@80x24.org> * symbol.c (rb_sym2id): do not return garbage object diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index c253b94d95..223879c2dc 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2293,6 +2293,7 @@ static void gzfile_reset(struct gzfile *gz) { zstream_reset(&gz->z); + gz->z.flags |= ZSTREAM_FLAG_GZFILE; gz->crc = crc32(0, Z_NULL, 0); gz->lineno = 0; gz->ungetc = 0; diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index f381b2ec0d..a7fa943c7a 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -695,6 +695,11 @@ if defined? Zlib assert_equal("foo", f.read) f.rewind assert_equal("foo", f.read) + + f.rewind + bytes = [] + f.each_byte { |b| bytes << b } + assert_equal "foo".bytes.to_a, bytes, '[Bug #10101]' end open(t.path, "rb") do |f| gz = Zlib::GzipReader.new(f) |