From 51f6ed8161442265448f5b6c462a3e442cf7fcb1 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 2 Dec 2010 08:07:18 +0000 Subject: merges r29484 from trunk into ruby_1_9_2. -- * lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte string. Thanks nobu and tDiary dev members. [Bug #3909] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 7be3e92577..9f8a63ac92 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -14,7 +14,7 @@ class CGI # string = CGI::unescape("%27Stop%21%27+said+Fred") # # => "'Stop!' said Fred" def CGI::unescape(string,encoding=@@accept_charset) - str=string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do + str=string.tr('+', ' ').force_encoding(Encoding::ASCII_8BIT).gsub(/((?:%[0-9a-fA-F]{2})+)/) do [$1.delete('%')].pack('H*') end.force_encoding(encoding) str.valid_encoding? ? str : str.force_encoding(string.encoding) -- cgit v1.2.3