Skip to content

sapi/apache2handler: function using char * to const char *. #14925

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 1 commit into from
Jul 11, 2024
Merged

sapi/apache2handler: function using char * to const char *. #14925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions sapi/apache2handler/php_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ PHP_FUNCTION(apache_getenv)
}
/* }}} */

static char *php_apache_get_version(void)
static const char *php_apache_get_version(void)
{
return (char *) ap_get_server_banner();
return ap_get_server_banner();
}

/* {{{ Fetch Apache version */
PHP_FUNCTION(apache_get_version)
{
char *apv = php_apache_get_version();
const char *apv = php_apache_get_version();

if (apv && *apv) {
RETURN_STRING(apv);
Expand All @@ -340,7 +340,7 @@ PHP_FUNCTION(apache_get_modules)
array_init(return_value);

for (n = 0; ap_loaded_modules[n]; ++n) {
char *s = (char *) ap_loaded_modules[n]->name;
const char *s = ap_loaded_modules[n]->name;
if ((p = strchr(s, '.'))) {
add_next_index_stringl(return_value, s, (p - s));
} else {
Expand All @@ -352,7 +352,7 @@ PHP_FUNCTION(apache_get_modules)

PHP_MINFO_FUNCTION(apache)
{
char *apv = php_apache_get_version();
const char *apv = php_apache_get_version();
smart_str tmp1 = {0};
char tmp[1024];
int n, max_requests;
Expand All @@ -363,21 +363,20 @@ PHP_MINFO_FUNCTION(apache)
#endif

for (n = 0; ap_loaded_modules[n]; ++n) {
char *s = (char *) ap_loaded_modules[n]->name;
const char *s = ap_loaded_modules[n]->name;
if (n > 0) {
smart_str_appendc(&tmp1, ' ');
}
if ((p = strchr(s, '.'))) {
smart_str_appendl(&tmp1, s, (p - s));
} else {
smart_str_appends(&tmp1, s);
}
smart_str_appendc(&tmp1, ' ');
}
if (tmp1.s) {
Copy link
Member

Choose a reason for hiding this comment

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

Note that we now have a trailing ' '. Although this code looks dubious to begin with (len > 0 check but still setting index 0 🤔 ).

Copy link
Member Author

@devnexen devnexen Jul 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

it was unconditionally used regardless below for displaying

Copy link
Member

Choose a reason for hiding this comment

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

Lol, indeed, even more bizarre... That said, it's maybe best to keep the behaviour that strips the last ' '.

if (tmp1.s->len > 0) {
tmp1.s->val[tmp1.s->len - 1] = '\0';
} else {
tmp1.s->val[0] = '\0';
}
if (!tmp1.s) {
Copy link
Member

Choose a reason for hiding this comment

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

This seems like a reasonable addition

smart_str_appendc(&tmp1, '/');
}
smart_str_0(&tmp1);

php_info_print_table_start();
if (apv && *apv) {
Expand Down Expand Up @@ -409,7 +408,7 @@ PHP_MINFO_FUNCTION(apache)

php_info_print_table_row(2, "Virtual Server", (serv->is_virtual ? "Yes" : "No"));
php_info_print_table_row(2, "Server Root", ap_server_root);
php_info_print_table_row(2, "Loaded Modules", tmp1.s->val);
php_info_print_table_row(2, "Loaded Modules", ZSTR_VAL(tmp1.s));

smart_str_free(&tmp1);
php_info_print_table_end();
Expand Down
Loading