[HttpKernel] fix HInclude src (closes #8951) #8960
Merged
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
fabpot
added a commit
that referenced
this pull request
Sep 8, 2013
This PR was merged into the 2.2 branch. Discussion ---------- [HttpKernel] fix HInclude src (closes #8951) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8951 | License | MIT | Doc PR | n/a fixes a regression introduced in #8879 Commits ------- 49f5027 [HttpKernel] fixer HInclude src (closes #8951)
| @@ -80,7 +80,8 @@ public function render($uri, Request $request, array $options = array()) | |||
| throw new \LogicException('You must use a proper URI when using the Hinclude rendering strategy or set a URL signer.'); | |||
| } | |||
|
|
|||
| $uri = $this->signer->sign($this->generateFragmentUri($uri, $request)); | |||
| // we need to sign the absolute URI, but want to return the path only. | |||
| $uri = str_replace($request->getSchemeAndHttpHost(), '', $this->signer->sign($this->generateFragmentUri($uri, $request, true))); | |||
There was a problem hiding this comment.
why not something like substr(..., strlen($request->getSchemeAndHttpHost()))
Seems more safe and reliable
There was a problem hiding this comment.
because the chars of scheme and host could possible be in the path as well, replacing them there by accident as well
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.
fixes a regression introduced in #8879