summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-10 03:24:33 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-10 03:24:33 +0000
commit33e54f3400b05a2e50d0d0a25cbd67a49ad08b29 (patch)
tree18fcbfe37221ac2a3c83f4fd437c742af0f273aa /ChangeLog
parent1b7b47010a73b8ecaebf28ca2ad5a2dbe73ad0d2 (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 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 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