Mercurial > hg > nginx-vendor-current

diff src/http/modules/ngx_http_secure_link_module.c @ 598:be70f83b184f NGINX_0_8_51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.51 *) Change: the "secure_link_expires" directive has been canceled. *) Change: a logging level of resolver errors has been lowered from "alert" to "error". *) Feature: now a listen socket "ssl" parameter may be set several times.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Sep 2010 00:00:00 +0400
parents 6c96fdd2dfc3
children d0f7a625f27c
line wrap: on
line diff
--- a/src/http/modules/ngx_http_secure_link_module.c
+++ b/src/http/modules/ngx_http_secure_link_module.c
@@ -14,7 +14,6 @@ typedef struct {
     ngx_http_complex_value_t  *variable;
     ngx_http_complex_value_t  *md5;
     ngx_str_t                  secret;
-    ngx_flag_t                 expires;
 } ngx_http_secure_link_conf_t;
 
 
@@ -38,25 +37,18 @@ static ngx_command_t  ngx_http_secure_li
 
     { ngx_string("secure_link"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_set_comlex_value_slot,
+      ngx_http_set_complex_value_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_secure_link_conf_t, variable),
       NULL },
 
     { ngx_string("secure_link_md5"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-      ngx_http_set_comlex_value_slot,
+      ngx_http_set_complex_value_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(ngx_http_secure_link_conf_t, md5),
       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_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -141,22 +133,20 @@ ngx_http_secure_link_variable(ngx_http_r
     if (p) {
         val.len = p++ - val.data;
 
-        if (conf->expires) {
-            expires = ngx_atotm(p, last - p);
-            if (expires <= 0) {
-                goto not_found;
-            }
+        expires = ngx_atotm(p, last - p);
+        if (expires <= 0) {
+            goto not_found;
+        }
 
-            ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_secure_link_ctx_t));
-            if (ctx == NULL) {
-                return NGX_ERROR;
-            }
+        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);
+        ngx_http_set_ctx(r, ctx, ngx_http_secure_link_module);
 
-            ctx->expires.len = last - p;
-            ctx->expires.data = p;
-        }
+        ctx->expires.len = last - p;
+        ctx->expires.data = p;
     }
 
     if (val.len > 24) {
@@ -317,8 +307,6 @@ ngx_http_secure_link_create_conf(ngx_con
      *     conf->secret = { 0, NULL };
      */
 
-    conf->expires = NGX_CONF_UNSET;
-
     return conf;
 }
 
@@ -339,8 +327,6 @@ ngx_http_secure_link_merge_conf(ngx_conf
         conf->md5 = prev->md5;
     }
 
-    ngx_conf_merge_value(conf->expires, prev->expires, 0);
-
     return NGX_CONF_OK;
 }