summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 10:49:00 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 10:49:00 +0000
commitc9d697ab7842e5672579cfb0e9bd0594ff95fe19 (patch)
treefcbbadfdc4e35e0a5d8487ec04feb5bc68680c37 /lib
parentf33246daebe70dc8ea62918fe8ef62f775676ec9 (diff)
merges r29976 from trunk into ruby_1_9_2.
-- * lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion by nested repeat operators. [ruby-core:33464] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/common.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 58fd422a5d..00a543c9f2 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -801,7 +801,7 @@ module URI
str
end
- WFKV_ = '(?:%\h\h|[^%#=;&]+)' # :nodoc:
+ WFKV_ = '(?:%\h\h|[^%#=;&])' # :nodoc:
# Decode URL-encoded form data from given +str+.
#