From ecc1dedabbb91ef3a8b14983c48fcb1b49a9be42 Mon Sep 17 00:00:00 2001 From: knu Date: Sun, 8 Jun 2008 17:35:41 +0000 Subject: * ext/zlib/zlib.c (rb_deflate_init_copy): Copy buffers as well. [ruby-list:45018] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 3 +++ version.h | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aae42a77b..e50874749b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 9 02:32:58 2008 Akinori MUSHA + + * ext/zlib/zlib.c (rb_deflate_init_copy): Copy buffers as well. + [ruby-list:45018] + Sun Jun 8 22:22:20 2008 wanabe * vm_insnhelper.c, vm.c, proc.c (proc_call): allow call method with diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 66616fb09f..c6c52b7454 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1126,6 +1126,9 @@ rb_deflate_init_copy(VALUE self, VALUE orig) if (err != Z_OK) { raise_zlib_error(err, 0); } + z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input); + z1->buf = NIL_P(z2->buf) ? Qnil : rb_str_dup(z2->buf); + z1->buf_filled = z2->buf_filled; z1->flags = z2->flags; return self; diff --git a/version.h b/version.h index 182a900350..32f96e2b3d 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-06-08" +#define RUBY_RELEASE_DATE "2008-06-09" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080608 +#define RUBY_RELEASE_CODE 20080609 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3