shyouhei	2008-06-27 17:44:52 +0900 (Fri, 27 Jun 2008)

  New Revision: 17608

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/zlib/zlib.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 17025:
    * ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
      initialize_copy; [ruby-list:45016], [ruby-list:45018].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17608&r2=17607&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17608&r2=17607&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/zlib/zlib.c?r1=17608&r2=17607&diff_format=u

Index: ruby_1_8_6/ext/zlib/zlib.c
===================================================================
--- ruby_1_8_6/ext/zlib/zlib.c	(revision 17607)
+++ ruby_1_8_6/ext/zlib/zlib.c	(revision 17608)
@@ -1182,14 +1182,19 @@
 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 @@
     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);
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17607)
+++ ruby_1_8_6/ChangeLog	(revision 17608)
@@ -1,3 +1,8 @@
+Fri Jun 27 17:38:21 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@r...>
 
 	* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17607)
+++ ruby_1_8_6/version.h	(revision 17608)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/