diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 07:21:52 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 07:21:52 +0000 |
| commit | 8ed4d5a465e0445057e6d6e5ee0e09e6448356f8 (patch) | |
| tree | 7a62e9cab080a5522e8b9633ac50c1c489fec9df /ChangeLog | |
| parent | b1ca15e4ee49fb8a583add67757a44bd39769fc3 (diff) | |
merge revision(s) 26326:
* ext/zlib/zlib.c: backport r18029 and r21861 from trunk.
* r18029 ext/zlib/zlib.c (rb_deflate_params): flush before
deflateParams. [ruby-core:17675] (by mame)
* r21861 ext/zlib/zlib.c (zstream_run): desperately guard the
variable. [ruby-core:20576] (by usa)
* test/zlib/test_zlib.rb: backport deflate tests from trunk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Thu May 20 16:17:37 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * ext/zlib/zlib.c: backport r18029 and r21861 from trunk. + * r18029 ext/zlib/zlib.c (rb_deflate_params): flush before + deflateParams. [ruby-core:17675] (by mame) + * r21861 ext/zlib/zlib.c (zstream_run): desperately guard the + variable. [ruby-core:20576] (by usa) + + * test/zlib/test_zlib.rb: backport deflate tests from trunk. + Thu May 20 15:59:14 2010 Kouhei Sutou <kou@cozmixng.org> * lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb: |