naruse	2008-08-23 23:29:00 +0900 (Sat, 23 Aug 2008)

  New Revision: 18794

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18794

  Log:
    * lib/cgi.rb (CGI#out): remove auto encoding conversion and set
      LANGUAGE. [ruby-dev:35922]

  Modified files:
    trunk/ChangeLog
    trunk/lib/cgi.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18793)
+++ ChangeLog	(revision 18794)
@@ -1,3 +1,8 @@
+Sat Aug 23 23:25:47 2008  NARUSE, Yui  <naruse@r...>
+
+	* 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@m...>
 
 	* test/ruby/test_process.rb (TestProcess#test_rlimit_value):
Index: lib/cgi.rb
===================================================================
--- lib/cgi.rb	(revision 18793)
+++ lib/cgi.rb	(revision 18794)
@@ -714,22 +714,6 @@
 
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/