summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 12:02:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 12:02:37 +0000
commit4142e34eb17d45450d3f2792f2634e1f5ffb9c9c (patch)
tree49a606735805570bf81617f04d3259dde330ed66 /lib
parent673a8b4859932d926051a27bd4b45c7bd3bed2b3 (diff)
merge revision(s) 55563: [Backport #12498]
* lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque only if the URI has path-rootless, not path-empty. [ruby-core:76055] [Bug #12498] patched by Chris Heisterkamp <cheister@squareup.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/mailto.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index b4405630a9..282dcbe404 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -135,6 +135,9 @@ module URI
@to = nil
@headers = []
+ # The RFC3986 parser does not normally populate opaque
+ @opaque = "?#{@query}" if @query && !@opaque
+
unless @opaque
raise InvalidComponentError,
"missing opaque part for mailto URL"