Fix basePath handling #1421
Merged
Fix basePath handling #1421
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
If the new path starts with a /, then it is absolute and so the base path needs to be cleared.
This occurs via createFromEnvironment when index.php is in a subdirectory as we create a URI that has a base path and a blank path. Casting to string needs to always include the concatenation of basePath and path.
| if (!$authority && substr($path, 0, 2) === '//') { | ||
| $path = '/' . ltrim($path, '/'); | ||
| } | ||
| $path = $basePath . '/' . ltrim($path, '/'); |
There was a problem hiding this comment.
There are two spaces after the first '/'.
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.
This PR fixes two issues:
withPath('/bar')basePathinto account every time, which results in an incorrect URI being returned in a specific situation. (test included)