diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 8 |
2 files changed, 9 insertions, 8 deletions
@@ -1,3 +1,12 @@ +Mon Dec 5 10:18:45 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937. + 1st, to change the mode of an IO is very sensitive problem, so + the maintainer of this library should judge it. + 2nd, usually Zlib::GzReader.new is not called directly. #initialize + is called via .open, and in the method the I/O is opened in binary + mode, so there is no problem without changing the mode in #initialize. + Sun Dec 4 22:53:12 2011 Tanaka Akira <akr@fsij.org> * lib/tempfile.rb: don't use lock directory. [ruby-dev:39197] diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 073883bc05..a235cbb621 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -10,7 +10,6 @@ #include <zlib.h> #include <time.h> #include <ruby/io.h> -#include <fcntl.h> #ifdef HAVE_VALGRIND_MEMCHECK_H # include <valgrind/memcheck.h> @@ -3426,13 +3425,6 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj) Data_Get_Struct(obj, struct gzfile, gz); rb_scan_args(argc, argv, "1:", &io, &opt); -#ifdef O_BINARY - if (BUILTIN_TYPE(io) == T_FILE) { - rb_io_t *fptr; - GetOpenFile(io, fptr); - setmode(fptr->fd, O_BINARY); - } -#endif /* this is undocumented feature of zlib */ err = inflateInit2(&gz->z.stream, -MAX_WBITS); |