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

4 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 28f6438337..3f945746e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 10 12:21:51 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
+
 Wed Sep 10 12:06:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
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;
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index b4fe5abc30..75473ee8eb 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -701,6 +701,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)
diff --git a/version.h b/version.h
index cf869a810c..5849ac2085 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 561
+#define RUBY_PATCHLEVEL 562
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9