Fix regression with header removal removing whole prefixes #21020
+29
−3
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
The header removal code looked for the colon for key-value at the wrong place, so it would overzealously remove headers. Tweak that condition, and make the alternative condition only active if it's set (with the remove prefix op case). Fixes phpGH-21018.
NattyNarwhal
changed the title
iluuu1994
approved these changes
Jan 27, 2026
Member
iluuu1994
left a comment
iluuu1994
left a comment
There was a problem hiding this comment.
Looks correct to me otherwise, as a person who doesn't know this code well.
main/SAPI.c
Outdated
| * since zend_llist_del_element only removes one matched item once, | ||
| * we should remove them manually | ||
| */ | ||
| static void sapi_remove_header(zend_llist *l, char *name, size_t len, size_t header_len) |
Member
There was a problem hiding this comment.
I find the name header_len very confusing. Maybe rename to prefix_len? It doesn't just include the header name fwiu.
Member
Author
There was a problem hiding this comment.
Good point, this is pretty confusing. Not sure what I was thinking then...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The header removal code looked for the colon for key-value at the wrong place, so it would overzealously remove headers. Tweak that condition, and make the alternative condition only active if it's set (with the remove prefix op case).
Fixes GH-21018.