diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Sep 4 16:29:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/cgi.rb (CGI::out): specify -m0 -x option for nkf. + [ruby-dev:29284] + Mon Sep 4 16:13:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (pipe_open): command name should not contain null bytes. diff --git a/lib/cgi.rb b/lib/cgi.rb index 1598df89f2..dc4d9ebec3 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -708,13 +708,13 @@ class CGI require "nkf" case options["charset"] when /iso-2022-jp/ni - content = NKF::nkf('-j', content) + content = NKF::nkf('-m0 -x -j', content) options["language"] = "ja" unless options.has_key?("language") when /euc-jp/ni - content = NKF::nkf('-e', content) + content = NKF::nkf('-m0 -x -e', content) options["language"] = "ja" unless options.has_key?("language") when /shift_jis/ni - content = NKF::nkf('-s', content) + content = NKF::nkf('-m0 -x -s', content) options["language"] = "ja" unless options.has_key?("language") end end |