Fix GH-16137: "Deduplicate" *Forwarded* http headers values. #16154
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
cmb69
reviewed
Oct 1, 2024
TimWolla
reviewed
Oct 2, 2024
TimWolla
reviewed
Oct 2, 2024
nielsdos
reviewed
Oct 2, 2024
nielsdos
reviewed
Oct 2, 2024
nielsdos
reviewed
Oct 2, 2024
| memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ", ", 2); | ||
| memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 2, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1); | ||
|
|
||
| ZVAL_STR(&tmp, newval); |
There was a problem hiding this comment.
Can use ZVAL_NEW_STR here, but not terribly important.
nielsdos
reviewed
Oct 3, 2024
nielsdos
approved these changes
Oct 3, 2024
cmb69
reviewed
Oct 3, 2024
sapi/cli/php_cli_server.c
Outdated
| * `Set-Cookie` HTTP header being the exception, they can have 1 or more values separated | ||
| * by a comma while still possibly be set separately by the client. | ||
| **/ | ||
| if ((entry == NULL && with_comma) || !with_comma) { |
There was a problem hiding this comment.
If you revert the conditions, you can simplify:
Suggested change
| if ((entry == NULL && with_comma) || !with_comma) { | |
| if (!with_comma || entry == NULL) { |
This is the same as with_comma → entry == NULL (logical implication).
sapi/cli/php_cli_server.c
Outdated
| **/ | ||
| if ((entry == NULL && with_comma) || !with_comma) { | ||
| ZVAL_STR(&tmp, client->current_header_value); | ||
|
|
There was a problem hiding this comment.
Superfluous empty line:
Suggested change
Those are meant to have 1 or plus values separated by a comma even if the client set them separately.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Those are meant to have 1 or plus values separated by a comma even
if the client set them separately.