* lib/uri/common.rb (URI::Parser#escape): escaped string is ascii

  only.

* lib/uri/common.rb (URI::Parser#unescape): converts bytewise.
  [ruby-dev:38005], [ruby-dev:38110]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 774a21afb6..210efdc8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar  2 19:43:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::Parser#escape): escaped string is ascii
+	  only.
+
+	* lib/uri/common.rb (URI::Parser#unescape): converts bytewise.
+	  [ruby-dev:38005], [ruby-dev:38110]
+
 Mon Mar  2 16:40:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT, README.EXT.ja (Macros): added HAVE_RUBY_*_H.
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 9a6a06894a..827ed7883d 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -223,11 +223,11 @@ module URI
           tmp << sprintf('%%%02X', uc)
         end
         tmp
-      end
+      end.force_encoding(Encoding::US_ASCII)
     end
 
     def unescape(str, escaped = @regexp[:ESCAPED])
-      str.gsub(escaped) { [$&[1, 2].hex].pack('U') }
+      str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
     end
 
     @@to_s = Kernel.instance_method(:to_s)