summaryrefslogtreecommitdiffstats
path: root/lib/cgi.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-23 14:29:00 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-23 14:29:00 +0000
commitacadae1b29f0749d81b48720c05e65e3031aacc0 (patch)
treefbd3d0435bf36d33f325dd6ce280d91b2569b9d1 /lib/cgi.rb
parent5e46fda5bf89dc20695a5351e34a6a5fb1c357ed (diff)
downloadruby-acadae1b29f0749d81b48720c05e65e3031aacc0.tar.gz
ruby-acadae1b29f0749d81b48720c05e65e3031aacc0.tar.xz
ruby-acadae1b29f0749d81b48720c05e65e3031aacc0.zip
* lib/cgi.rb (CGI#out): remove auto encoding conversion and set
LANGUAGE. [ruby-dev:35922] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi.rb')
-rw-r--r--lib/cgi.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 30c8bc0fb..574385583 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