diff options
Diffstat (limited to 'src/http/ngx_http_variables.h')
| -rw-r--r-- | src/http/ngx_http_variables.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h index df0fc9efa..67b781e6d 100644 --- a/src/http/ngx_http_variables.h +++ b/src/http/ngx_http_variables.h @@ -14,18 +14,22 @@ #include <ngx_http.h> -#define NGX_HTTP_VAR_NOT_FOUND (ngx_http_variable_value_t *) -1 +typedef struct { + unsigned len:29; + unsigned valid:1; + unsigned no_cachable:1; + unsigned not_found:1; -typedef struct { - ngx_uint_t value; - ngx_str_t text; + u_char *data; } ngx_http_variable_value_t; +#define ngx_http_variable(v) { sizeof(v) - 1, 1, 0, 0, (u_char *) v } + typedef struct ngx_http_variable_s ngx_http_variable_t; -typedef ngx_http_variable_value_t * - (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data); +typedef ngx_int_t (*ngx_http_get_variable_pt) (ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); #define NGX_HTTP_VAR_CHANGABLE 1 @@ -34,11 +38,11 @@ typedef ngx_http_variable_value_t * struct ngx_http_variable_s { - ngx_str_t name; /* must be first to build the hash */ - ngx_http_get_variable_pt handler; - uintptr_t data; - ngx_uint_t flags; - ngx_uint_t index; + ngx_str_t name; /* must be first to build the hash */ + ngx_http_get_variable_pt handler; + uintptr_t data; + ngx_uint_t flags; + ngx_uint_t index; }; @@ -47,9 +51,15 @@ ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, ngx_int_t ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name); ngx_http_variable_value_t *ngx_http_get_indexed_variable(ngx_http_request_t *r, ngx_uint_t index); +ngx_http_variable_value_t *ngx_http_get_flushed_variable(ngx_http_request_t *r, + ngx_uint_t index); + ngx_http_variable_value_t *ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name); +#define ngx_http_clear_variable(r, index) r->variables0[index].text.data = NULL; + + ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf); ngx_int_t ngx_http_variables_init_vars(ngx_conf_t *cf); |