diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-27 08:44:52 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-27 08:44:52 +0000 |
| commit | dcf3bc392ec73143cb2d8c27703746fda466db89 (patch) | |
| tree | 987b1b2190aedc309ca0441de336744a9e193c5d | |
| parent | 7c95864980e1bccbc508974a78fbedc9dc0f9524 (diff) | |
merge revision(s) 17025:
* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
initialize_copy; [ruby-list:45016], [ruby-list:45018].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 11 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Jun 27 17:38:21 2008 Akinori MUSHA <knu@iDaemons.org> + + * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up + initialize_copy; [ruby-list:45016], [ruby-list:45018]. + Fri Jun 27 17:28:39 2008 NAKAMURA Usaku <usa@ruby-lang.org> * io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 1b89553772..d4c5028920 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1182,14 +1182,19 @@ static VALUE rb_deflate_init_copy(self, orig) VALUE self, orig; { - struct zstream *z1 = get_zstream(self); - struct zstream *z2 = get_zstream(orig); + struct zstream *z1, *z2; int err; + Data_Get_Struct(self, struct zstream, z1); + z2 = get_zstream(orig); + err = deflateCopy(&z1->stream, &z2->stream); 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; @@ -3371,7 +3376,7 @@ void Init_zlib() rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1); rb_define_alloc_func(cDeflate, rb_deflate_s_allocate); rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1); - rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 0); + rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 1); rb_define_method(cDeflate, "deflate", rb_deflate_deflate, -1); rb_define_method(cDeflate, "<<", rb_deflate_addstr, 1); rb_define_method(cDeflate, "flush", rb_deflate_flush, -1); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-27" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080627 -#define RUBY_PATCHLEVEL 235 +#define RUBY_PATCHLEVEL 236 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |