Skip to content

FPM: refactor fpm_php_get_string_from_table() to better match usage #11051

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 2 commits into from
May 20, 2023
Merged

FPM: refactor fpm_php_get_string_from_table() to better match usage #11051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35ed40b
FPM: refactor fpm_php_get_string_from_table() to better match usage
Girgias Apr 10, 2023
3360378
Address review
Girgias Apr 11, 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
18 changes: 9 additions & 9 deletions sapi/fpm/fpm/fpm_php.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,13 @@ int fpm_php_limit_extensions(char *path) /* {{{ */
}
/* }}} */

char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */
bool fpm_php_is_key_in_table(zend_string *table, const char *key, size_t key_len) /* {{{ */
{
zval *data, *tmp;
zval *data;
zend_string *str;
if (!table || !key) {
return NULL;
}

ZEND_ASSERT(table);
ZEND_ASSERT(key);

/* inspired from ext/standard/info.c */

Expand All @@ -270,12 +270,12 @@ char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */
return NULL;
}

ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(data), str, tmp) {
if (str && !strncmp(ZSTR_VAL(str), key, ZSTR_LEN(str))) {
return Z_STRVAL_P(tmp);
ZEND_HASH_FOREACH_STR_KEY(Z_ARRVAL_P(data), str) {
if (str && zend_string_equals_cstr(str, key, key_len)) {
return true;
}
} ZEND_HASH_FOREACH_END();

return NULL;
return false;
}
/* }}} */
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_php.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ void fpm_php_soft_quit(void);
int fpm_php_init_main(void);
int fpm_php_apply_defines_ex(struct key_value_s *kv, int mode);
int fpm_php_limit_extensions(char *path);
char* fpm_php_get_string_from_table(zend_string *table, char *key);
bool fpm_php_is_key_in_table(zend_string *table, const char *key, size_t key_len);

#endif
13 changes: 7 additions & 6 deletions sapi/fpm/fpm/fpm_status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ int fpm_status_handle_request(void) /* {{{ */
int full, encode, has_start_time;
char *short_syntax, *short_post;
char *full_pre, *full_syntax, *full_post, *full_separator;
zend_string *_GET_str;

if (!SG(request_info).request_uri) {
return 0;
Expand All @@ -168,11 +167,13 @@ int fpm_status_handle_request(void) /* {{{ */

/* STATUS */
if (fpm_status_uri && !strcmp(fpm_status_uri, SG(request_info).request_uri)) {
zend_string *_GET_str;

fpm_request_executing();

/* full status ? */
_GET_str = ZSTR_INIT_LITERAL("_GET", 0);
full = (fpm_php_get_string_from_table(_GET_str, "full") != NULL);
full = fpm_php_is_key_in_table(_GET_str, ZEND_STRL("full"));
short_syntax = short_post = NULL;
full_separator = full_pre = full_syntax = full_post = NULL;
encode = 0;
Expand Down Expand Up @@ -215,7 +216,7 @@ int fpm_status_handle_request(void) /* {{{ */
}

/* HTML */
if (fpm_php_get_string_from_table(_GET_str, "html")) {
if (fpm_php_is_key_in_table(_GET_str, ZEND_STRL("html"))) {
sapi_add_header_ex(ZEND_STRL("Content-Type: text/html"), 1, 1);
time_format = "%d/%b/%Y:%H:%M:%S %z";
encode = 1;
Expand Down Expand Up @@ -284,7 +285,7 @@ int fpm_status_handle_request(void) /* {{{ */
}

/* XML */
} else if (fpm_php_get_string_from_table(_GET_str, "xml")) {
} else if (fpm_php_is_key_in_table(_GET_str, ZEND_STRL("xml"))) {
sapi_add_header_ex(ZEND_STRL("Content-Type: text/xml"), 1, 1);
time_format = "%s";
encode = 1;
Expand Down Expand Up @@ -332,7 +333,7 @@ int fpm_status_handle_request(void) /* {{{ */
}

/* JSON */
} else if (fpm_php_get_string_from_table(_GET_str, "json")) {
} else if (fpm_php_is_key_in_table(_GET_str, ZEND_STRL("json"))) {
sapi_add_header_ex(ZEND_STRL("Content-Type: application/json"), 1, 1);
time_format = "%s";

Expand Down Expand Up @@ -379,7 +380,7 @@ int fpm_status_handle_request(void) /* {{{ */
}

/* OpenMetrics */
} else if (fpm_php_get_string_from_table(_GET_str, "openmetrics")) {
} else if (fpm_php_is_key_in_table(_GET_str, ZEND_STRL("openmetrics"))) {
sapi_add_header_ex(ZEND_STRL("Content-Type: application/openmetrics-text; version=1.0.0; charset=utf-8"), 1, 1);
time_format = "%s";

Expand Down