2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24396be89f..77de182d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep  7 12:44:26 2008  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (make_writeconv): choose ASCII compatible encoding as
+	  intermediate encoding if stateful encoder exists.
+
 Sun Sep  7 12:09:29 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/encoding.h (ECONV_XML_ATTR_CONTENT_ENCODER): defined.
diff --git a/io.c b/io.c
index 5c43a062de..b7a5314983 100644
--- a/io.c
+++ b/io.c
@@ -729,6 +729,14 @@ make_writeconv(rb_io_t *fptr)
                     denc = enc->name;
                     fptr->writeconv_stateless = rb_str_new2(senc);
                 }
+                else if ((fptr->encs.ecflags & ECONV_STATEFUL_ENCODER_MASK) && !rb_enc_asciicompat(enc)) {
+                    /* xxx: stateful encoder works for ASCII compatible encoding.
+                     * So we need to choose an encoding which is ASCII compatible and superset of enc.
+                     * For encodings which is superset of UTF-8, UTF-8 is not appropriate choice.  */
+                    senc = "UTF-8";
+                    denc = enc->name;
+                    fptr->writeconv_stateless = rb_str_new2("UTF-8");
+                }
                 else {
                     senc = denc = "";
                     fptr->writeconv_stateless = rb_str_new2(enc->name);