merge revision(s) 42271: [Backport #8713]

	* lib/uri/common.rb (URI.decode_www_form_component):
	  Don't raise error when str includes multibyte characters.


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

4 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d4b3274bf8..a9b22edea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug  3 22:24:44 2013  Shota Fukumori  <her@sorah.jp>
+
+	* lib/uri/common.rb (URI.decode_www_form_component):
+	  Don't raise error when str includes multibyte characters.
+
 Sun Jul 28 22:00:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* rational.c (f_round_common): Rational is expected to be returned by
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index b285687f4d..e71b36793b 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -896,7 +896,9 @@ module URI
   # See URI.encode_www_form_component, URI.decode_www_form
   def self.decode_www_form_component(str, enc=Encoding::UTF_8)
     raise ArgumentError, "invalid %-encoding (#{str})" unless /\A[^%]*(?:%\h\h[^%]*)*\z/ =~ str
-    str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)
+    str.dup.force_encoding("ASCII-8BIT") \
+       .gsub(/\+|%\h\h/, TBLDECWWWCOMP_) \
+       .force_encoding(enc)
   end
 
   # Generate URL-encoded form data from given +enum+.
diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb
index 9dc87dcbc5..97c6035340 100644
--- a/test/uri/test_common.rb
+++ b/test/uri/test_common.rb
@@ -69,6 +69,9 @@ class TestCommon < Test::Unit::TestCase
                    "AZ%5B%5C%5D%5E_%60az%7B%7C%7D%7E"))
     assert_equal("\xA1\xA2".force_encoding(Encoding::EUC_JP),
                  URI.decode_www_form_component("%A1%A2", "EUC-JP"))
+    assert_equal("\xE3\x81\x82\xE3\x81\x82".force_encoding("UTF-8"),
+                 URI.decode_www_form_component("\xE3\x81\x82%E3%81%82".force_encoding("UTF-8")))
+
     assert_raise(ArgumentError){URI.decode_www_form_component("%")}
   end
 
diff --git a/version.h b/version.h
index 725a8aef56..8c26ababa2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-08-03"
-#define RUBY_PATCHLEVEL 284
+#define RUBY_PATCHLEVEL 285
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 8