summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-18 08:14:38 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-18 08:14:38 +0000
commit5c8d6f1bc36f676de37caa349ebf62913302ebfd (patch)
tree0d89c273e2f242197ea59b93719c97f92fe715cf
parentd196598075acb68fdfd45032d7ae211318271c86 (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi.rb2
2 files changed, 7 insertions, 0 deletions
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