summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-11 13:59:05 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-11 13:59:05 +0000
commit3ac9fd49e67e09c4e77680c37bd0b757f95be845 (patch)
treef141b0f2be23af3a9acf147d14bc391f08f0a0d3
parent30babb83a9a9f2f3e80f879dc516c811344adbdc (diff)
downloadruby-3ac9fd49e67e09c4e77680c37bd0b757f95be845.tar.gz
ruby-3ac9fd49e67e09c4e77680c37bd0b757f95be845.tar.xz
ruby-3ac9fd49e67e09c4e77680c37bd0b757f95be845.zip
* ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams.
[ruby-core:17675] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cab9a4d09..2e69e7676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 11 22:58:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams.
+ [ruby-core:17675]
+
Fri Jul 11 22:09:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/setup.rb, win32/Makefile.sub (PLATFORM): use $(PLATFORM)
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c6c52b745..636ec325c 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1293,6 +1293,7 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
level = ARG_LEVEL(v_level);
strategy = ARG_STRATEGY(v_strategy);
+ zstream_run(z, (Bytef*)"", 0, Z_SYNC_FLUSH);
err = deflateParams(&z->stream, level, strategy);
while (err == Z_BUF_ERROR) {
rb_warning("deflateParams() returned Z_BUF_ERROR");