[3.3] Fixed pathinfo calculation for requests starting with a question mark. #24573
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
- fix bad conflict resolving issue - port #21968 to 3.3+
|
Thank you @aivus. |
fabpot
added a commit
that referenced
this pull request
Oct 16, 2017
…h a question mark. (syzygymsu) This PR was merged into the 3.3 branch. Discussion ---------- [3.3] Fixed pathinfo calculation for requests starting with a question mark. | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24487 | License | MIT | Doc PR | no Fix of bad merge conflict resolving as mentioned in #24487. Port #21968 to 3.3+ Commits ------- c17a922 Fixed pathinfo calculation for requests starting with a question mark. - fix bad conflict resolving issue - port #21968 to 3.3+
This was referenced Oct 30, 2017
Merged
Merged
Merged
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.
Fix of bad merge conflict resolving as mentioned in #24487. Port #21968 to 3.3+