From 5c8d6f1bc36f676de37caa349ebf62913302ebfd Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 18 May 2006 08:14:38 +0000
Subject: [PATCH] * lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
   <fuj@rabbix.jp>.  [ruby-dev:28649]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 lib/cgi.rb | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cbe65d9761..ea7fba9a03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
+	  <fuj@rabbix.jp>.  [ruby-dev:28649]
+
 Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 2d75ac2488..54dc07a5a3 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -716,6 +716,8 @@ class CGI
       when /shift_jis/ni
         content = NKF::nkf('-s', content)
         options["language"] = "ja" unless options.has_key?("language")
+      when /utf-8/ni
+        content = NKF::nkf('-w', content)
       end
     end