-
Notifications
You must be signed in to change notification settings - Fork 162
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.
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
URL: Appending to an empty file path results in an absolute path #988
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@swift-ci please test |
Thank you for fixing this! |
jrflat
force-pushed
the
empty-path-append
branch
from
October 23, 2024 04:30
d86c7a9
to
7bcd5f0
Compare
Updated the behavior slightly to be more compatible for clients expecting the relative path to start with |
@swift-ci please test |
jmschonfeld
approved these changes
Oct 23, 2024
tshortli
added a commit
to tshortli/swift-foundation
that referenced
this pull request
Oct 24, 2024
…n absolute path (swiftlang#988)" This reverts commit f077992.
jrflat
added a commit
to jrflat/swift-foundation
that referenced
this pull request
Oct 25, 2024
jrflat
added a commit
that referenced
this pull request
Oct 29, 2024
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When appending
path
to a URL with an empty relative path, the current code does:"" + "/" + path
. This is problematic because it makes the relative path absolute, so it no longer resolves against the base URL.E.g. for the following code,
we should get an output of
"/my/cwd/main.swift"
, not"/main.swift"
.This PR updates
URL.appending(path:)
so if the current path is empty (and thus relative), we don't append a slash which would make the path absolute. That is unless we have an authority. If we have an authority, we must add a slash to separate the path from the authority, e.g.URL("http://example.com").appending(path: "path") == http://example.com/path
.Resolves #921 (thanks @omochi for filing!)