diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:24:33 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:24:33 +0000 |
| commit | 33e54f3400b05a2e50d0d0a25cbd67a49ad08b29 (patch) | |
| tree | 18fcbfe37221ac2a3c83f4fd437c742af0f273aa /ext | |
| parent | 1b7b47010a73b8ecaebf28ca2ad5a2dbe73ad0d2 (diff) | |
merge revision(s) 47327: [Backport #10101]
* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
[Bug #10101]
* test/zlib/test_zlib.rb (test_rewind): test each_byte
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 9294c2c857..095727bca2 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2286,6 +2286,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; |