IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 14:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Headers filter: variables support in expires (ticket #113).

Browse Source
This commit is contained in:
Maxim Dounin 2014-12-11 23:42:11 +03:00
parent cf21308885
commit d8c7616074
1 changed files with 127 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/http/modules/ngx_http_headers_filter_module.c
View File

@ -44,14 +44,17 @@ typedef enum {
typedef struct { typedef struct {
ngx_http_expires_t expires; ngx_http_expires_t expires;
time_t expires_time; time_t expires_time;
ngx_array_t *headers; ngx_http_complex_value_t *expires_value;
ngx_array_t *headers;
} ngx_http_headers_conf_t; } ngx_http_headers_conf_t;
static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r, static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r,
ngx_http_headers_conf_t *conf); ngx_http_headers_conf_t *conf);
static ngx_int_t ngx_http_parse_expires(ngx_str_t *value,
ngx_http_expires_t *expires, time_t *expires_time, char **err);
static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r, static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r,
ngx_http_header_val_t *hv, ngx_str_t *value); ngx_http_header_val_t *hv, ngx_str_t *value);
static ngx_int_t ngx_http_add_header(ngx_http_request_t *r, static ngx_int_t ngx_http_add_header(ngx_http_request_t *r,
@ -209,8 +212,11 @@ ngx_http_headers_filter(ngx_http_request_t *r)
static ngx_int_t static ngx_int_t
ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf) ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
{ {
char *err;
size_t len; size_t len;
time_t now, expires_time, max_age; time_t now, expires_time, max_age;
ngx_str_t value;
ngx_int_t rc;
ngx_uint_t i; ngx_uint_t i;
ngx_table_elt_t *e, *cc, **ccp; ngx_table_elt_t *e, *cc, **ccp;
ngx_http_expires_t expires; ngx_http_expires_t expires;
@ -218,6 +224,23 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
expires = conf->expires; expires = conf->expires;
expires_time = conf->expires_time; expires_time = conf->expires_time;
if (conf->expires_value != NULL) {
if (ngx_http_complex_value(r, conf->expires_value, &value) != NGX_OK) {
return NGX_ERROR;
}
rc = ngx_http_parse_expires(&value, &expires, &expires_time, &err);
if (rc != NGX_OK) {
return NGX_OK;
}
if (expires == NGX_HTTP_EXPIRES_OFF) {
return NGX_OK;
}
}
e = r->headers_out.expires; e = r->headers_out.expires;
if (e == NULL) { if (e == NULL) {
@ -331,6 +354,78 @@ ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
} }
static ngx_int_t
ngx_http_parse_expires(ngx_str_t *value, ngx_http_expires_t *expires,
time_t *expires_time, char **err)
{
ngx_uint_t minus;
if (*expires != NGX_HTTP_EXPIRES_MODIFIED) {
if (value->len == 5 && ngx_strncmp(value->data, "epoch", 5) == 0) {
*expires = NGX_HTTP_EXPIRES_EPOCH;
return NGX_OK;
}
if (value->len == 3 && ngx_strncmp(value->data, "max", 3) == 0) {
*expires = NGX_HTTP_EXPIRES_MAX;
return NGX_OK;
}
if (value->len == 3 && ngx_strncmp(value->data, "off", 3) == 0) {
*expires = NGX_HTTP_EXPIRES_OFF;
return NGX_OK;
}
}
if (value->data[0] == '@') {
value->data++;
value->len--;
minus = 0;
if (*expires == NGX_HTTP_EXPIRES_MODIFIED) {
*err = "daily time cannot be used with \"modified\" parameter";
return NGX_ERROR;
}
*expires = NGX_HTTP_EXPIRES_DAILY;
} else if (value->data[0] == '+') {
value->data++;
value->len--;
minus = 0;
} else if (value->data[0] == '-') {
value->data++;
value->len--;
minus = 1;
} else {
minus = 0;
}
*expires_time = ngx_parse_time(value, 1);
if (*expires_time == (time_t) NGX_ERROR) {
*err = "invalid value";
return NGX_ERROR;
}
if (*expires == NGX_HTTP_EXPIRES_DAILY
&& *expires_time > 24 * 60 * 60)
{
*err = "daily time value must be less than 24 hours";
return NGX_ERROR;
}
if (minus) {
*expires_time = - *expires_time;
}
return NGX_OK;
}
static ngx_int_t static ngx_int_t
ngx_http_add_header(ngx_http_request_t *r, ngx_http_header_val_t *hv, ngx_http_add_header(ngx_http_request_t *r, ngx_http_header_val_t *hv,
ngx_str_t *value) ngx_str_t *value)
@ -461,6 +556,7 @@ ngx_http_headers_create_conf(ngx_conf_t *cf)
* *
* conf->headers = NULL; * conf->headers = NULL;
* conf->expires_time = 0; * conf->expires_time = 0;
* conf->expires_value = NULL;
*/ */
conf->expires = NGX_HTTP_EXPIRES_UNSET; conf->expires = NGX_HTTP_EXPIRES_UNSET;
@ -478,6 +574,7 @@ ngx_http_headers_merge_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->expires == NGX_HTTP_EXPIRES_UNSET) { if (conf->expires == NGX_HTTP_EXPIRES_UNSET) {
conf->expires = prev->expires; conf->expires = prev->expires;
conf->expires_time = prev->expires_time; conf->expires_time = prev->expires_time;
conf->expires_value = prev->expires_value;
if (conf->expires == NGX_HTTP_EXPIRES_UNSET) { if (conf->expires == NGX_HTTP_EXPIRES_UNSET) {
conf->expires = NGX_HTTP_EXPIRES_OFF; conf->expires = NGX_HTTP_EXPIRES_OFF;
@ -507,8 +604,12 @@ ngx_http_headers_expires(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
ngx_http_headers_conf_t *hcf = conf; ngx_http_headers_conf_t *hcf = conf;
ngx_uint_t minus, n; char *err;
ngx_str_t *value; ngx_str_t *value;
ngx_int_t rc;
ngx_uint_t n;
ngx_http_complex_value_t cv;
ngx_http_compile_complex_value_t ccv;
if (hcf->expires != NGX_HTTP_EXPIRES_UNSET) { if (hcf->expires != NGX_HTTP_EXPIRES_UNSET) {
return "is duplicate"; return "is duplicate";
@ -518,21 +619,6 @@ ngx_http_headers_expires(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (cf->args->nelts == 2) { if (cf->args->nelts == 2) {
if (ngx_strcmp(value[1].data, "epoch") == 0) {
hcf->expires = NGX_HTTP_EXPIRES_EPOCH;
return NGX_CONF_OK;
}
if (ngx_strcmp(value[1].data, "max") == 0) {
hcf->expires = NGX_HTTP_EXPIRES_MAX;
return NGX_CONF_OK;
}
if (ngx_strcmp(value[1].data, "off") == 0) {
hcf->expires = NGX_HTTP_EXPIRES_OFF;
return NGX_CONF_OK;
}
hcf->expires = NGX_HTTP_EXPIRES_ACCESS; hcf->expires = NGX_HTTP_EXPIRES_ACCESS;
n = 1; n = 1;
@ -548,45 +634,33 @@ ngx_http_headers_expires(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
n = 2; n = 2;
} }
if (value[n].data[0] == '@') { ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
value[n].data++;
value[n].len--;
minus = 0;
if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) { ccv.cf = cf;
return "daily time cannot be used with \"modified\" parameter"; ccv.value = &value[n];
ccv.complex_value = &cv;
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}
if (cv.lengths != NULL) {
hcf->expires_value = ngx_palloc(cf->pool,
sizeof(ngx_http_complex_value_t));
if (hcf->expires_value == NULL) {
return NGX_CONF_ERROR;
} }
hcf->expires = NGX_HTTP_EXPIRES_DAILY; *hcf->expires_value = cv;
} else if (value[n].data[0] == '+') { return NGX_CONF_OK;
value[n].data++;
value[n].len--;
minus = 0;
} else if (value[n].data[0] == '-') {
value[n].data++;
value[n].len--;
minus = 1;
} else {
minus = 0;
} }
hcf->expires_time = ngx_parse_time(&value[n], 1); rc = ngx_http_parse_expires(&value[n], &hcf->expires, &hcf->expires_time,
&err);
if (hcf->expires_time == (time_t) NGX_ERROR) { if (rc != NGX_OK) {
return "invalid value"; return err;
}
if (hcf->expires == NGX_HTTP_EXPIRES_DAILY
&& hcf->expires_time > 24 * 60 * 60)
{
return "daily time value must be less than 24 hours";
}
if (minus) {
hcf->expires_time = - hcf->expires_time;
} }
return NGX_CONF_OK; return NGX_CONF_OK;