diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 13:27:01 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 13:27:01 +0000 |
| commit | a1525108b87dac3032754f4152d37258f3ea4c0c (patch) | |
| tree | ef38470d2d9754a4271995e1a0d3792429620e48 /lib | |
| parent | 65fcd2e73881b48c587433a5fbebc6c2794c1ebd (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/uri/common.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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+. |