summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi.rb8
2 files changed, 3 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e42a09f8b..fd210ee233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,11 +9,6 @@ Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_rename): use errno if set properly.
fixed: [ruby-dev:29293]
-Fri Aug 18 01:05:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a
- patch from Fujioka <fuj at rabbix.jp>. [ruby-dev:29284]
-
Thu Aug 17 19:15:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_stat_[rRwWxX]): check for super user.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 0878edffa4..1598df89f2 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -708,16 +708,14 @@ class CGI
require "nkf"
case options["charset"]
when /iso-2022-jp/ni
- content = NKF::nkf('-j -m0', content)
+ content = NKF::nkf('-j', content)
options["language"] = "ja" unless options.has_key?("language")
when /euc-jp/ni
- content = NKF::nkf('-e -m0', content)
+ content = NKF::nkf('-e', content)
options["language"] = "ja" unless options.has_key?("language")
when /shift_jis/ni
- content = NKF::nkf('-s -m0', content)
+ content = NKF::nkf('-s', content)
options["language"] = "ja" unless options.has_key?("language")
- when /utf-8/ni
- content = NKF::nkf('-w -m0', content)
end
end