diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 16 |
2 files changed, 5 insertions, 16 deletions
@@ -1,3 +1,8 @@ +Sat Aug 23 23:25:47 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/cgi.rb (CGI#out): remove auto encoding conversion and set + LANGUAGE. [ruby-dev:35922] + Sat Aug 23 20:01:29 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * test/ruby/test_process.rb (TestProcess#test_rlimit_value): diff --git a/lib/cgi.rb b/lib/cgi.rb index 30c8bc0fbd..5743855837 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -714,22 +714,6 @@ class CGI options = { "type" => options } if options.kind_of?(String) content = yield - - if options.has_key?("charset") - require "nkf" - case options["charset"] - when /iso-2022-jp/ni - content = NKF::nkf('-j -m0 -x', content) - options["language"] = "ja" unless options.has_key?("language") - when /euc-jp/ni - content = NKF::nkf('-e -m0 -x', content) - options["language"] = "ja" unless options.has_key?("language") - when /shift_jis/ni - content = NKF::nkf('-s -m0 -x', content) - options["language"] = "ja" unless options.has_key?("language") - end - end - options["length"] = content.bytesize.to_s output = stdoutput output.binmode if defined? output.binmode |