Skip to content

Fix regression with header removal removing whole prefixes #21020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NattyNarwhal wants to merge 3 commits into
base: PHP-8.5
Choose a base branch
from
+29 −3
Open

Fix regression with header removal removing whole prefixes #21020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ab035
Fix regression with header removing removing whole prefixes
NattyNarwhal Jan 23, 2026
b31a03f
avoid reading past the actual length
NattyNarwhal Jan 23, 2026
c8710e3
Rename variable to be more clear
NattyNarwhal Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ext/standard/tests/general_functions/gh21018.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
GH-21018 (header() removes headers with the same prefix)
--INI--
expose_php=On
--CGI--
--FILE--
<?php
header('a: 1');
header('a-test: 1');
header('a: 1');
var_dump(headers_list());
?>
--EXPECTF--
array(3) {
[0]=>
string(%d) "X-Powered-By: PHP/%s"
[1]=>
string(9) "a-test: 1"
[2]=>
string(4) "a: 1"
}
11 changes: 8 additions & 3 deletions main/SAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ static void sapi_update_response_code(int ncode)
* 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)
static void sapi_remove_header(zend_llist *l, char *name, size_t len, size_t prefix_len)
{
sapi_header_struct *header;
zend_llist_element *next;
Expand All @@ -610,8 +610,13 @@ static void sapi_remove_header(zend_llist *l, char *name, size_t len, size_t hea
while (current) {
header = (sapi_header_struct *)(current->data);
next = current->next;
if (header->header_len > header_len
&& (header->header[header_len] == ':' || len > header_len)
/*
* prefix_len is set for DELETE_PREFIX (used for deleting i.e.
* "Set-Cookie: PHPSESSID=", where we need more than just key)
* look for the : otherwise
*/
if (header->header_len > len
&& (header->header[len] == ':' || (prefix_len && len > prefix_len))
&& !strncasecmp(header->header, name, len)) {
if (current->prev) {
current->prev->next = next;
Expand Down
Loading