WIP [HttpFoundation] fix detection of request uri, base url, base path, path info #7632
Conversation
This file contains hidden or 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
…ath info I synchronized the code with the changes done upstream in ZF: https://github.com/zendframework/zf2/blob/master/library/Zend/Http/PhpEnvironment/Request.php I also added tests from ZF and symfony#7329. I also rewrote the preparePathInfo slightly because there were some strange things.
| $truncatedRequestUri = substr($requestUri, 0, $pos); | ||
| } | ||
|
|
||
| $basename = basename($baseUrl); | ||
| if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) { |
There was a problem hiding this comment.
dont see why rawurldecode was done
There was a problem hiding this comment.
@Tobion I did change it (adding the raw prefix) in here - I can't remember why, try to look at the tests.
More interesting might be the original commit where the decode was added.
|
What is the status of this PR @Tobion? |
|
@Tobion Can you finish this one? |
|
I try. Unfortunately I can't remember why I was stuck / why I didnt finish / what's left to do. |
|
Ah I see. It's my comment above. I think there was some wrong code in ZF as well. And I didn't want to copy code that seems buggy to me. But I didn't have time to discuss this with the zend guys. |
|
So, let's close it then. |
|
@Tobion ? |
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.
WIP
BC break: no
Tests pass: no
Fixes: #7329 (not yet)
I synchronized the code with the changes done upstream in ZF: https://github.com/zendframework/zf2/blob/master/library/Zend/Http/PhpEnvironment/Request.php
I also added tests from ZF and #7329.
I also rewrote the
preparePathInfoslightly because there were some strange things.