From 34deabcbac30a0411b6946f0c810cd73e1051b7e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 17 Aug 2006 17:06:52 +0000
Subject: [PATCH] * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@10746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 lib/cgi.rb | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1954163b26..9139d82967 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 4308efcb6b..4cd497849a 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -718,16 +718,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