* include/ruby/encoding.h (ECONV_ERROR_HANDLER_MASK): defined.

  (ECONV_DECODER_MASK): defined.
  (ECONV_ENCODER_MASK): defined.

* io.c (make_writeconv): restrict ecflags for writeconv with
  ECONV_ERROR_HANDLER_MASK. 



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/io.c b/io.c
index 88217efe0a..ac7c1f16b5 100644
--- a/io.c
+++ b/io.c
@@ -716,6 +716,7 @@ make_writeconv(rb_io_t *fptr)
         if (NEED_NEWLINE_ENCODER(fptr))
             fptr->writeconv_pre_ecflags |= TEXTMODE_NEWLINE_ENCODER;
 #endif
+        ecflags &= ECONV_ERROR_HANDLER_MASK;
 
         enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc;
         senc = rb_econv_stateless_encoding(enc->name);