From 392d9eca822341c59864a4475f9bb785aed80ce4 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 24 Jul 2008 19:14:47 +0000 Subject: * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/nkf/nkf.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eefabb32f..2485d3791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 25 04:12:57 2008 NARUSE, Yui + + * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII. + Fri Jul 25 02:43:11 2008 Yusuke Endoh * 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 c64605b38..24761449d 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; } -- cgit