diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:11:37 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:11:37 +0000 |
| commit | f50e791c028457465ece677f055f2e2092b6e19c (patch) | |
| tree | cfc4c39f3e481e7199d16e02afb8613e4b760264 /ext | |
| parent | 3c0e4e61d68e20c239d1a8a25ca6e931ca1d802e (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index ffc566197c..2c9fcbc9f6 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 |