1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

revert nkf -m0 patch for UTF-8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-08-22 09:38:19 +00:00
parent bb788d2328
commit 0abbcb67d1
2 changed files with 3 additions and 10 deletions

View file

@ -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.

View file

@ -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