technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Var: Refactored nxt_http_unknown_var_ref()

Browse Source
This commit is contained in:
Zhidao HONG
2024-01-31 14:11:29 +08:00
parent 62894ae77b
commit 01fd121c4e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nxt_http_variables.c
View File

@@ -135,8 +135,7 @@ nxt_http_register_variables(void)
nxt_int_t nxt_int_t
nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref, nxt_http_unknown_var_ref(nxt_mp_t *mp, nxt_var_ref_t *ref, nxt_str_t *name)
nxt_str_t *name)
{ {
int64_t hash; int64_t hash;
nxt_str_t str, *lower; nxt_str_t str, *lower;
@@ -152,7 +151,7 @@ nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref,
return NXT_ERROR; return NXT_ERROR;
} }
lower = nxt_str_alloc(state->pool, str.length); lower = nxt_str_alloc(mp, str.length);
if (nxt_slow_path(lower == NULL)) { if (nxt_slow_path(lower == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -175,7 +174,7 @@ nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref,
return NXT_ERROR; return NXT_ERROR;
} }
hash = nxt_http_header_hash(state->pool, &str); hash = nxt_http_header_hash(mp, &str);
if (nxt_slow_path(hash == -1)) { if (nxt_slow_path(hash == -1)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -191,7 +190,7 @@ nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref,
return NXT_ERROR; return NXT_ERROR;
} }
hash = nxt_http_argument_hash(state->pool, &str); hash = nxt_http_argument_hash(mp, &str);
if (nxt_slow_path(hash == -1)) { if (nxt_slow_path(hash == -1)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -207,7 +206,7 @@ nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref,
return NXT_ERROR; return NXT_ERROR;
} }
hash = nxt_http_cookie_hash(state->pool, &str); hash = nxt_http_cookie_hash(mp, &str);
if (nxt_slow_path(hash == -1)) { if (nxt_slow_path(hash == -1)) {
return NXT_ERROR; return NXT_ERROR;
} }
@@ -216,7 +215,7 @@ nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref,
return NXT_ERROR; return NXT_ERROR;
} }
ref->data = nxt_var_field_new(state->pool, &str, (uint32_t) hash); ref->data = nxt_var_field_new(mp, &str, (uint32_t) hash);
if (nxt_slow_path(ref->data == NULL)) { if (nxt_slow_path(ref->data == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }

2
src/nxt_var.c
View File

@@ -141,7 +141,7 @@ nxt_var_ref_get(nxt_tstr_state_t *state, nxt_str_t *name)
goto done; goto done;
} }
ret = nxt_http_unknown_var_ref(state, ref, name); ret = nxt_http_unknown_var_ref(state->pool, ref, name);
if (nxt_slow_path(ret != NXT_OK)) { if (nxt_slow_path(ret != NXT_OK)) {
return NULL; return NULL;
} }

2
src/nxt_var.h
View File

@@ -62,7 +62,7 @@ nxt_int_t nxt_var_interpreter(nxt_task_t *task, nxt_tstr_state_t *state,
nxt_str_t *nxt_var_get(nxt_task_t *task, nxt_var_cache_t *cache, nxt_str_t *nxt_var_get(nxt_task_t *task, nxt_var_cache_t *cache,
nxt_str_t *name, void *ctx); nxt_str_t *name, void *ctx);
nxt_int_t nxt_http_unknown_var_ref(nxt_tstr_state_t *state, nxt_var_ref_t *ref, nxt_int_t nxt_http_unknown_var_ref(nxt_mp_t *mp, nxt_var_ref_t *ref,
nxt_str_t *name); nxt_str_t *name);