summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/nkf/nkf.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eefabb32f5..2485d37913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 25 04:12:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
+
Fri Jul 25 02:43:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
* sample/coverage.rb: move from lib/coverage.rb because this remains in
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index c64605b382..24761449d2 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -169,7 +169,10 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
rb_str_set_len(result, output_ctr);
OBJ_INFECT(result, src);
- rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+ if (mimeout_f)
+ rb_enc_associate(result, rb_usascii_encoding());
+ else
+ rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
return result;
}