[ruby-cvs:54567] nagachika:r47419 (ruby_2_1): merge revision(s) r47327: [Backport #10008]

[nagachika at ruby-lang.org]

nagachika	2014-09-06 00:58:09 +0900 (Sat, 06 Sep 2014)

  New Revision: 47419

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47419

  Log:
    merge revision(s) r47327: [Backport #10008]
    
    * ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
      [Bug #10101]
    
    * test/zlib/test_zlib.rb (test_rewind): test each_byte

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/zlib/zlib.c
    branches/ruby_2_1/test/zlib/test_zlib.rb
    branches/ruby_2_1/version.h