diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-30 08:21:16 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-30 08:21:16 +0000 |
commit | b3e306a5f48814e883be4ab138ecbaebffcb2765 (patch) | |
tree | 58e06ee289a6417f43fb076ab2036e242e3d0d1e /ChangeLog | |
parent | 1d0ddd4218e701d086b3e4f21fd38183fa3a4e8a (diff) |
merge revision(s) 34552: [Bug #6516]
* ext/zlib/zlib.c (do_inflate): Inflate more data if buffered data
exists. Allows Zlib::Inflate#set_dictionary to work.
[ruby-trunk - Bug #5929]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Wed May 30 17:19:56 2012 Eric Hodel <drbrain@segment7.net> + + * ext/zlib/zlib.c (do_inflate): Inflate more data if buffered data + exists. Allows Zlib::Inflate#set_dictionary to work. + [ruby-trunk - Bug #5929] + Mon May 28 11:40:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_extract_modeenc): fail only if conflicting |