From 954d456a9621aeee7c859babfb35dadb2b28b247 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 4 Sep 2006 07:37:26 +0000 Subject: * lib/cgi.rb (CGI::out): specify -m0 -x option for nkf. [ruby-dev:29284] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/cgi.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55cb8584d1..20cf02993a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 4 16:29:33 2006 Yukihiro Matsumoto + + * lib/cgi.rb (CGI::out): specify -m0 -x option for nkf. + [ruby-dev:29284] + Mon Sep 4 16:13:23 2006 Yukihiro Matsumoto * 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 -- cgit v1.2.3