IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

discard "secure_link_expires on|off"

Browse Source
This commit is contained in:
Igor Sysoev 2010-09-06 14:19:18 +00:00
parent c13a4098b7
commit 12f4da4695
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/http/modules/ngx_http_secure_link_module.c
View File

@ -14,7 +14,6 @@ typedef struct {
ngx_http_complex_value_t *variable; ngx_http_complex_value_t *variable;
ngx_http_complex_value_t *md5; ngx_http_complex_value_t *md5;
ngx_str_t secret; ngx_str_t secret;
ngx_flag_t expires;
} ngx_http_secure_link_conf_t; } ngx_http_secure_link_conf_t;
@ -50,13 +49,6 @@ static ngx_command_t ngx_http_secure_link_commands[] = {
offsetof(ngx_http_secure_link_conf_t, md5), offsetof(ngx_http_secure_link_conf_t, md5),
NULL }, NULL },
{ ngx_string("secure_link_expires"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_secure_link_conf_t, expires),
NULL },
{ ngx_string("secure_link_secret"), { ngx_string("secure_link_secret"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot, ngx_conf_set_str_slot,
@ -141,22 +133,20 @@ ngx_http_secure_link_variable(ngx_http_request_t *r,
if (p) { if (p) {
val.len = p++ - val.data; val.len = p++ - val.data;
if (conf->expires) { expires = ngx_atotm(p, last - p);
expires = ngx_atotm(p, last - p); if (expires <= 0) {
if (expires <= 0) { goto not_found;
goto not_found;
}
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_secure_link_ctx_t));
if (ctx == NULL) {
return NGX_ERROR;
}
ngx_http_set_ctx(r, ctx, ngx_http_secure_link_module);
ctx->expires.len = last - p;
ctx->expires.data = p;
} }
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_secure_link_ctx_t));
if (ctx == NULL) {
return NGX_ERROR;
}
ngx_http_set_ctx(r, ctx, ngx_http_secure_link_module);
ctx->expires.len = last - p;
ctx->expires.data = p;
} }
if (val.len > 24) { if (val.len > 24) {
@ -317,8 +307,6 @@ ngx_http_secure_link_create_conf(ngx_conf_t *cf)
* conf->secret = { 0, NULL }; * conf->secret = { 0, NULL };
*/ */
conf->expires = NGX_CONF_UNSET;
return conf; return conf;
} }
@ -339,8 +327,6 @@ ngx_http_secure_link_merge_conf(ngx_conf_t *cf, void *parent, void *child)
conf->md5 = prev->md5; conf->md5 = prev->md5;
} }
ngx_conf_merge_value(conf->expires, prev->expires, 0);
return NGX_CONF_OK; return NGX_CONF_OK;
} }