summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-17 16:25:21 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-17 16:25:21 +0000
commite332544d62b20eb2ff6f4d6fad367cdf4a5df475 (patch)
tree211a7abd832db186c377253ce94b8503cf301b8d
parentfab9b0a6a916194e1ed26a72ae3bbb4dbe87958b (diff)
downloadruby-e332544d62b20eb2ff6f4d6fad367cdf4a5df475.tar.gz
ruby-e332544d62b20eb2ff6f4d6fad367cdf4a5df475.tar.xz
ruby-e332544d62b20eb2ff6f4d6fad367cdf4a5df475.zip
* lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a
patch from Fujioka <fuj at rabbix.jp>. [ruby-dev:29284] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 92fa8925e..b0ee6995c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 8ea9c3def..0878edffa 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -708,16 +708,16 @@ class CGI
require "nkf"
case options["charset"]
when /iso-2022-jp/ni
- content = NKF::nkf('-j', content)
+ content = NKF::nkf('-j -m0', content)
options["language"] = "ja" unless options.has_key?("language")
when /euc-jp/ni
- content = NKF::nkf('-e', content)
+ content = NKF::nkf('-e -m0', content)
options["language"] = "ja" unless options.has_key?("language")
when /shift_jis/ni
- content = NKF::nkf('-s', content)
+ content = NKF::nkf('-s -m0', content)
options["language"] = "ja" unless options.has_key?("language")
when /utf-8/ni
- content = NKF::nkf('-w', content)
+ content = NKF::nkf('-w -m0', content)
end
end