summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-31 09:34:34 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-31 09:34:34 +0000
commit601f783827d8a7ef90537bab02d9ea6cc0b7f0f7 (patch)
treec8653df5c347b97a3e66778f9a73670adf8dc162
parent1c7f9073b018319fbea5ffe98d7264d4553aaec1 (diff)
* lib/uri/common.rb (URI.decode_www_form_component): Use String#b.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/uri/common.rb4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da8a2cc..4420f0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 31 18:32:25 2013 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/uri/common.rb (URI.decode_www_form_component): Use String#b.
+
Wed Jul 31 18:24:02 2013 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_mod_refine, mod_using, top_using): don't show
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 8c657cd..771be97 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -899,9 +899,7 @@ 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.dup.force_encoding("ASCII-8BIT") \
- .gsub(/\+|%\h\h/, TBLDECWWWCOMP_) \
- .force_encoding(enc)
+ str.b.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)
end
# Generate URL-encoded form data from given +enum+.