diff options
Diffstat (limited to 'src/http/ngx_http_variables.h')
| -rw-r--r-- | src/http/ngx_http_variables.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/http/ngx_http_variables.h b/src/http/ngx_http_variables.h index bf80386cb..6624535aa 100644 --- a/src/http/ngx_http_variables.h +++ b/src/http/ngx_http_variables.h @@ -14,13 +14,13 @@ #include <ngx_http.h> -#define NGX_HTTP_VARIABLE_NOT_FOUND (ngx_http_variable_value_t *) -1 +#define NGX_HTTP_VAR_NOT_FOUND (ngx_http_variable_value_t *) -1 -struct ngx_http_variable_value_s { +typedef struct { ngx_uint_t value; ngx_str_t text; -}; +} ngx_http_variable_value_t; typedef struct ngx_http_variable_s ngx_http_variable_t; @@ -28,30 +28,28 @@ typedef ngx_http_variable_value_t * (*ngx_http_get_variable_pt) (ngx_http_request_t *r, uintptr_t data); -struct ngx_http_variable_s { - ngx_str_t name; - ngx_uint_t index; - ngx_http_get_variable_pt handler; - uintptr_t data; -}; +#define NGX_HTTP_VAR_CHANGABLE 1 +#define NGX_HTTP_VAR_NOCACHABLE 2 -typedef struct { - ngx_str_t name; +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_http_core_variable_t; + ngx_uint_t flags; +}; ngx_http_variable_t *ngx_http_add_variable(ngx_conf_t *cf, ngx_str_t *name, - ngx_uint_t set); -ngx_int_t ngx_http_get_variable_index(ngx_http_core_main_conf_t *cmcf, - ngx_str_t *name); + ngx_uint_t flags); +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_variable(ngx_http_request_t *r, ngx_str_t *name); -ngx_int_t ngx_http_variables_init(ngx_cycle_t *cycle); + +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); #endif /* _NGX_HTTP_VARIABLES_H_INCLUDED_ */ |