From 4167a04b69717d8d135872a8e68e6e49127695ce Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Oct 2009 16:11:37 +0000
Subject: merges r24704 from trunk into ruby_1_9_1. -- * ext/zlib/zlib.c
 (gzfile_read_all): use gzfile_newstr;   set and convert its encoding.
 [ruby-dev:38304]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/zlib/zlib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index ffc566197..2c9fcbc9f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -2198,7 +2198,7 @@ gzfile_read_all(struct gzfile *gz)
     dst = zstream_detach_buffer(&gz->z);
     gzfile_calc_crc(gz, dst);
     OBJ_TAINT(dst);
-    return dst;
+    return gzfile_newstr(gz, dst);
 }
 
 static VALUE
-- 
cgit