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

Summary: Var: removing all async stuff.

Browse Source 
No functional changes.
This commit is contained in:
Zhidao HONG
2022-06-02 09:36:35 +08:00
parent 4f16479482
commit 0d2d40e231
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nxt_http_variables.c
View File

@@ -7,14 +7,12 @@
#include <nxt_http.h> #include <nxt_http.h>
static nxt_int_t nxt_http_var_method(nxt_task_t *task, nxt_var_query_t *query, static nxt_int_t nxt_http_var_method(nxt_task_t *task, nxt_str_t *str,
nxt_str_t *str, void *ctx); void *ctx);
static nxt_int_t nxt_http_var_request_uri(nxt_task_t *task, static nxt_int_t nxt_http_var_request_uri(nxt_task_t *task, nxt_str_t *str,
nxt_var_query_t *query, nxt_str_t *str, void *ctx); void *ctx);
static nxt_int_t nxt_http_var_uri(nxt_task_t *task, nxt_var_query_t *query, static nxt_int_t nxt_http_var_uri(nxt_task_t *task, nxt_str_t *str, void *ctx);
nxt_str_t *str, void *ctx); static nxt_int_t nxt_http_var_host(nxt_task_t *task, nxt_str_t *str, void *ctx);
static nxt_int_t nxt_http_var_host(nxt_task_t *task, nxt_var_query_t *query,
nxt_str_t *str, void *ctx);
static nxt_var_decl_t nxt_http_vars[] = { static nxt_var_decl_t nxt_http_vars[] = {
@@ -44,8 +42,7 @@ nxt_http_register_variables(void)
static nxt_int_t static nxt_int_t
nxt_http_var_method(nxt_task_t *task, nxt_var_query_t *query, nxt_str_t *str, nxt_http_var_method(nxt_task_t *task, nxt_str_t *str, void *ctx)
void *ctx)
{ {
nxt_http_request_t *r; nxt_http_request_t *r;
@@ -58,8 +55,7 @@ nxt_http_var_method(nxt_task_t *task, nxt_var_query_t *query, nxt_str_t *str,
static nxt_int_t static nxt_int_t
nxt_http_var_request_uri(nxt_task_t *task, nxt_var_query_t *query, nxt_http_var_request_uri(nxt_task_t *task, nxt_str_t *str, void *ctx)
nxt_str_t *str, void *ctx)
{ {
nxt_http_request_t *r; nxt_http_request_t *r;
@@ -72,8 +68,7 @@ nxt_http_var_request_uri(nxt_task_t *task, nxt_var_query_t *query,
static nxt_int_t static nxt_int_t
nxt_http_var_uri(nxt_task_t *task, nxt_var_query_t *query, nxt_str_t *str, nxt_http_var_uri(nxt_task_t *task, nxt_str_t *str, void *ctx)
void *ctx)
{ {
nxt_http_request_t *r; nxt_http_request_t *r;
@@ -86,8 +81,7 @@ nxt_http_var_uri(nxt_task_t *task, nxt_var_query_t *query, nxt_str_t *str,
static nxt_int_t static nxt_int_t
nxt_http_var_host(nxt_task_t *task, nxt_var_query_t *query, nxt_str_t *str, nxt_http_var_host(nxt_task_t *task, nxt_str_t *str, void *ctx)
void *ctx)
{ {
nxt_http_request_t *r; nxt_http_request_t *r;

11
src/nxt_var.c
View File

@@ -494,17 +494,12 @@ nxt_var_query(nxt_task_t *task, nxt_var_query_t *query, nxt_var_t *var,
continue; /* NXT_DECLINED */ continue; /* NXT_DECLINED */
} }
ret = nxt_var_index[index](task, query, value, query->ctx); ret = nxt_var_index[index](task, value, query->ctx);
if (nxt_slow_path(ret != NXT_OK)) {
value = NULL;
if (ret != NXT_OK) {
if (nxt_slow_path(ret != NXT_AGAIN)) {
goto fail; goto fail;
} }
query->waiting++; value = NULL;
}
} }
query->spare = value; query->spare = value;

1
src/nxt_var.h
View File

@@ -12,7 +12,6 @@ typedef struct nxt_var_query_s nxt_var_query_t;
typedef nxt_int_t (*nxt_var_handler_t)(nxt_task_t *task, typedef nxt_int_t (*nxt_var_handler_t)(nxt_task_t *task,
nxt_var_query_t *query,
nxt_str_t *str, nxt_str_t *str,
void *ctx); void *ctx);