From 012dc9d099db8b500e319894b4ed2cd0e7ad3f42 Mon Sep 17 00:00:00 2001 From: zzak Date: Sun, 2 Jun 2013 06:06:00 +0000 Subject: * lib/cgi/util.rb, lib/erb.rb: Use String#b [Feature #8394] by znz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/cgi') diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 98ff4be0ca..3fc462df27 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -15,7 +15,7 @@ module CGI::Util # string = CGI::unescape("%27Stop%21%27+said+Fred") # # => "'Stop!' said Fred" def unescape(string,encoding=@@accept_charset) - str=string.tr('+', ' ').force_encoding(Encoding::ASCII_8BIT).gsub(/((?:%[0-9a-fA-F]{2})+)/) do + str=string.tr('+', ' ').b.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