mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Setting $args now invalidates unparsed uri.

Browse Source 
Prodded by Yichun Zhang.
This commit is contained in:
Maxim Dounin 2014-05-19 22:45:35 +04:00
parent 4884cd611e
commit 84409ec8e0
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/ngx_http_variables.c
View File

@ -13,8 +13,10 @@
static ngx_int_t ngx_http_variable_request(ngx_http_request_t *r, static ngx_int_t ngx_http_variable_request(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
#if 0
static void ngx_http_variable_request_set(ngx_http_request_t *r, static void ngx_http_variable_request_set(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
#endif
static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r, static ngx_int_t ngx_http_variable_request_get_size(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
static void ngx_http_variable_request_set_size(ngx_http_request_t *r, static void ngx_http_variable_request_set_size(ngx_http_request_t *r,
@ -64,6 +66,8 @@ static ngx_int_t ngx_http_variable_scheme(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_https(ngx_http_request_t *r, static ngx_int_t ngx_http_variable_https(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
static void ngx_http_variable_set_args(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_is_args(ngx_http_request_t *r, static ngx_int_t ngx_http_variable_is_args(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data); ngx_http_variable_value_t *v, uintptr_t data);
static ngx_int_t ngx_http_variable_document_root(ngx_http_request_t *r, static ngx_int_t ngx_http_variable_document_root(ngx_http_request_t *r,
@ -223,7 +227,7 @@ static ngx_http_variable_t ngx_http_core_variables[] = {
NGX_HTTP_VAR_NOCACHEABLE, 0 }, NGX_HTTP_VAR_NOCACHEABLE, 0 },
{ ngx_string("args"), { ngx_string("args"),
ngx_http_variable_request_set, ngx_http_variable_set_args,
ngx_http_variable_request, ngx_http_variable_request,
offsetof(ngx_http_request_t, args), offsetof(ngx_http_request_t, args),
NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 }, NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
@ -662,6 +666,8 @@ ngx_http_variable_request(ngx_http_request_t *r, ngx_http_variable_value_t *v,
} }
#if 0
static void static void
ngx_http_variable_request_set(ngx_http_request_t *r, ngx_http_variable_request_set(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data) ngx_http_variable_value_t *v, uintptr_t data)
@ -674,6 +680,8 @@ ngx_http_variable_request_set(ngx_http_request_t *r,
s->data = v->data; s->data = v->data;
} }
#endif
static ngx_int_t static ngx_int_t
ngx_http_variable_request_get_size(ngx_http_request_t *r, ngx_http_variable_request_get_size(ngx_http_request_t *r,
@ -1371,6 +1379,16 @@ ngx_http_variable_https(ngx_http_request_t *r,
} }
static void
ngx_http_variable_set_args(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data)
{
r->args.len = v->len;
r->args.data = v->data;
r->valid_unparsed_uri = 0;
}
static ngx_int_t static ngx_int_t
ngx_http_variable_is_args(ngx_http_request_t *r, ngx_http_variable_is_args(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data) ngx_http_variable_value_t *v, uintptr_t data)