summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-20 10:54:19 +0000
committerakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-20 10:54:19 +0000
commit84fac7f8bbb079940bc19614e4e4e251e9ea829f (patch)
tree2256463ddbde9f93bdef715f373ea82fefd3c798 /lib
parent1b6332f16e564b395598cb1fea06c9fe88db21c7 (diff)
downloadruby-84fac7f8bbb079940bc19614e4e4e251e9ea829f.tar.gz
ruby-84fac7f8bbb079940bc19614e4e4e251e9ea829f.tar.xz
ruby-84fac7f8bbb079940bc19614e4e4e251e9ea829f.zip
should raise InvalidComponentError if MAILTO_REGEXP could not match with @opaque.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/mailto.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 100cd6430..d50d2b792 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -51,7 +51,7 @@ module URI
# headers = "?" header *( "&" header )
# to = #mailbox
# mailtoURL = "mailto:" [ to ] [ headers ]
- MAILBOX_PATTERN = "(?:[^(),%?=&]|#{PATTERN::ESCAPED})".freeze
+ MAILBOX_PATTERN = "(?:#{PATTERN::ESCAPED}|[^(),%?=&])".freeze
MAILTO_REGEXP = Regexp.new("
\\A
(#{MAILBOX_PATTERN}*?) (?# 1: to)
@@ -128,7 +128,8 @@ module URI
set_to($1)
set_headers($2)
end
- elsif arg[-1]
+
+ else
raise InvalidComponentError,
"unrecognised opaque part for mailtoURL: #{@opaque}"
end