Skip to content

Fix bug with schemaless URI in URI.merge/2 #13970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Fix bug with schemaless URI in URI.merge/2 #13970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/elixir/lib/uri.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ defmodule URI do
%{rel | path: remove_dot_segments_from_path(rel.path)}
end

def merge(base, %URI{host: host} = rel) when host != nil do
def merge(%URI{} = base, %URI{host: host} = rel) when host != nil do
%{rel | scheme: base.scheme, path: remove_dot_segments_from_path(rel.path)}
end

Expand Down
3 changes: 3 additions & 0 deletions lib/elixir/test/elixir/uri_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,9 @@ defmodule URITest do
assert URI.merge("http://google.com/foo", "//example.com/baz")
|> to_string == "http://example.com/baz"

assert URI.merge("http://google.com/foo", URI.new!("//example.com/baz"))
|> to_string == "http://example.com/baz"

assert URI.merge("http://google.com/foo", "//example.com/.././bar/../../../baz")
|> to_string == "http://example.com/baz"

Expand Down
Loading