Skip to content

sapi/cli: php_cli_server_client_save_header() crash on repeated headers. #25142

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

Closed
devnexen wants to merge 3 commits into from
Closed

sapi/cli: php_cli_server_client_save_header() crash on repeated headers. #25142

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
099f688
sapi/cli: php_cli_server_client_save_header() crash on repeated headers.
devnexen Nov 2, 2026
226a739
ditch the hash loop, while preserving stable branch behavior.
devnexen Nov 2, 2026
c85a918
clarifying comment
devnexen Nov 3, 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
9 changes: 7 additions & 2 deletions sapi/cli/php_cli_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,9 +1408,8 @@ static void php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */
req->query_string = NULL;
req->query_string_len = 0;
zend_hash_init(&req->headers, 0, NULL, cli_header_value_dtor, 1);
/* No destructor is registered as the value pointed by is the same as for &req->headers */
GC_MAKE_PERSISTENT_LOCAL(&req->headers);
zend_hash_init(&req->headers_original_case, 0, NULL, NULL, 1);
zend_hash_init(&req->headers_original_case, 0, NULL, cli_header_value_dtor, 1);
GC_MAKE_PERSISTENT_LOCAL(&req->headers_original_case);
req->content = NULL;
req->content_len = 0;
Expand Down Expand Up @@ -1701,16 +1700,22 @@ static void php_cli_server_client_save_header(php_cli_server_client *client)
} else {
zend_string *curval = Z_STR_P(entry);
zend_string *newval = zend_string_safe_alloc(1, ZSTR_LEN(curval), ZSTR_LEN(client->current_header_value) + 2, /* persistent */true);
GC_MAKE_PERSISTENT_LOCAL(newval);

memcpy(ZSTR_VAL(newval), ZSTR_VAL(curval), ZSTR_LEN(curval));
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);
zend_string_release_ex(client->current_header_value, /* persistent */ true);
}

/* Add/Update the wrapped zend_string to the HashTable */
zend_hash_update(&client->request.headers, lc_header_name, &tmp);
/* Each table owns a reference to the new value. The old value can outlive the update
* above, as a repeat spelled differently keeps the first spelling's entry in
* headers_original_case. */
zend_string_addref(Z_STR(tmp));

@ndossche ndossche Nov 3, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the update above releases its value

Then why does the addref come after the update?

zend_hash_update(&client->request.headers_original_case, client->current_header_name, &tmp);

zend_string_release_ex(lc_header_name, /* persistent */ true);
Expand Down
36 changes: 36 additions & 0 deletions sapi/cli/tests/gh16137_duplicate_headers.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
GH-16137: CLI server handling of repeated request headers
--SKIPIF--
<?php
include "skipif.inc";
?>
--FILE--
<?php
include "php_cli_server.inc";
php_cli_server_start('$h = getallheaders(); unset($h["Host"], $h["Connection"]); var_dump($h);');
$ctx = stream_context_create(['http' => ['header' => [
'X-Foo: a',
'X-Foo: b',
'Cookie: Foo',
'cOOKIE: Bar',
'Set-Cookie: first',
'set-cookie: second',
]]]);
echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS, false, $ctx);
echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS);
?>
--EXPECT--
array(5) {
["X-Foo"]=>
string(4) "a, b"
["Cookie"]=>
string(3) "Foo"
["cOOKIE"]=>
string(8) "Foo, Bar"
["Set-Cookie"]=>
string(5) "first"
["set-cookie"]=>
string(6) "second"
}
array(0) {
}
Loading