diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-24 19:14:47 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-24 19:14:47 +0000 |
| commit | b7464f8513d5a2160cfe98951fe8187c275fc71b (patch) | |
| tree | 895d8397ed595de66912ed7f3382494a14a0b530 | |
| parent | 59f23bd421656f8d754e43be6a62824d0b9824ac (diff) | |
* ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/nkf/nkf.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -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; } |