summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 10:37:02 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 10:37:02 +0000
commitb9c9103d2f94ba6356c26378e02518877df18675 (patch)
treee574e3f7a43a4c835a8ad2d2d5ce3b1882d972f2
parent1006add4de794e124c3c37dbab1190d255712170 (diff)
downloadruby-b9c9103d2f94ba6356c26378e02518877df18675.tar.gz
ruby-b9c9103d2f94ba6356c26378e02518877df18675.tar.xz
ruby-b9c9103d2f94ba6356c26378e02518877df18675.zip
* io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 892ccb367..83bd015cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 6 19:36:34 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (rb_io_binmode): clear newline flags in writeconv_pre_ecflags.
+
Sat Sep 6 18:47:40 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (str_transcode0): check ECONV_HTML_TEXT_ENCODER and
diff --git a/io.c b/io.c
index 1833835cc..88217efe0 100644
--- a/io.c
+++ b/io.c
@@ -3500,6 +3500,7 @@ rb_io_binmode(VALUE io)
rb_econv_binmode(fptr->writeconv);
fptr->mode |= FMODE_BINMODE;
fptr->mode &= ~FMODE_TEXTMODE;
+ fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECODER|ECONV_CRLF_NEWLINE_ENCODER|ECONV_CR_NEWLINE_ENCODER);
return io;
}