summaryrefslogtreecommitdiff
path: root/lib/uri/generic.rb
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2023-10-24 13:26:03 -0700
committergit <svn-admin@ruby-lang.org>2024-01-05 16:07:55 +0000
commit37657c79b66994147e41f31139ceb9c0c840868f (patch)
treefc9c8cb272b27b91195dfd16bf3015a736eee536 /lib/uri/generic.rb
parent557f1a5705cdcfb059b67495ed63767cb2e2c72b (diff)
[ruby/uri] Make URI#to_s prepend relative path with / if there is a host or port
Otherwise, the path could be considered part of the host or port. This is better than modifying the path to make it absolute when a host or port is set. We could also raise for invalid paths when a host or port is set using check_path, but that results in weird errors, and won't catch issues (such as ftp allowing a relative path). Fixes [Bug #19916] https://github.com/ruby/uri/commit/ac32aa005b
Diffstat (limited to 'lib/uri/generic.rb')
-rw-r--r--lib/uri/generic.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index f3540a24bb..9ea2335cea 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1364,6 +1364,9 @@ module URI
str << ':'
str << @port.to_s
end
+ if (@host || @port) && !@path.empty? && !@path.start_with?('/')
+ str << '/'
+ end
str << @path
if @query
str << '?'