Skip to content

Make SERVER_SOFTWARE compliant with RFC3875 #11093

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

Merged
merged 3 commits into from
May 5, 2023
Merged

Make SERVER_SOFTWARE compliant with RFC3875 #11093

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
d2bd4ee
Make SERVER_SOFTWARE compliant with RFC3875
cedric-anne Apr 17, 2023
1aa636e
Update tests
cedric-anne Apr 17, 2023
52f2607
[ci skip] UPGRADING
cedric-anne Apr 17, 2023
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
3 changes: 3 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ PHP 8.3 UPGRADE NOTES
3. Changes in SAPI modules
========================================

- $_SERVER['SERVER_SOFTWARE'] value from the built-in CLI server changed
to make it compliant with RFC3875.

========================================
4. Deprecated Functionality
========================================
Expand Down
2 changes: 1 addition & 1 deletion sapi/cli/php_cli_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ static void sapi_cli_server_register_variables(zval *track_vars_array) /* {{{ */
}
}
{
zend_string *tmp = strpprintf(0, "PHP %s Development Server", PHP_VERSION);
zend_string *tmp = strpprintf(0, "PHP/%s (Development Server)", PHP_VERSION);
sapi_cli_server_register_known_var_str(track_vars_array, "SERVER_SOFTWARE", strlen("SERVER_SOFTWARE"), tmp);
zend_string_release_ex(tmp, /* persistent */ false);
}
Expand Down
2 changes: 1 addition & 1 deletion sapi/cli/tests/php_cli_server_002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
?>
--EXPECTF--
string(%d) "string(%d) "%sphp_cli_server_002"
string(%d) "PHP %s Development Server"
string(%d) "PHP/%s (Development Server)"
string(%d) "localhost"
string(%d) "%s"
"