1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/uri/common.rb (URI.decode_www_form_component):

Browse Source 
Don't raise error when str includes multibyte characters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2013-07-31 09:00:18 +00:00
parent 37c05ec3ed
commit b30a172385
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 31 17:55:55 2013 Shota Fukumori <her@sorah.jp>
* lib/uri/common.rb (URI.decode_www_form_component):
Don't raise error when str includes multibyte characters.
Wed Jul 31 17:45:39 2013 Masaki Matsushita <glass.saga@gmail.com> Wed Jul 31 17:45:39 2013 Masaki Matsushita <glass.saga@gmail.com>
* string.c (rb_str_rindex): performance improvement by using * string.c (rb_str_rindex): performance improvement by using

4
lib/uri/common.rb
View File

@ -899,7 +899,9 @@ module URI
# See URI.encode_www_form_component, URI.decode_www_form # See URI.encode_www_form_component, URI.decode_www_form
def self.decode_www_form_component(str, enc=Encoding::UTF_8) def self.decode_www_form_component(str, enc=Encoding::UTF_8)
raise ArgumentError, "invalid %-encoding (#{str})" unless /\A[^%]*(?:%\h\h[^%]*)*\z/ =~ str 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 end
# Generate URL-encoded form data from given +enum+. # Generate URL-encoded form data from given +enum+.

3
test/uri/test_common.rb
View File

@ -91,6 +91,9 @@ class TestCommon < Test::Unit::TestCase
"AZ%5B%5C%5D%5E_%60az%7B%7C%7D%7E")) "AZ%5B%5C%5D%5E_%60az%7B%7C%7D%7E"))
assert_equal("\xA1\xA2".force_encoding(Encoding::EUC_JP), assert_equal("\xA1\xA2".force_encoding(Encoding::EUC_JP),
URI.decode_www_form_component("%A1%A2", "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("%")} assert_raise(ArgumentError){URI.decode_www_form_component("%")}
end end