commit 4b46b7fc5b09c8afeb106db3c409cb7ba948fbfa
author Ruslan Ermilov <ru@nginx.com> Mon Jan 28 14:42:07 2013 +0000
committer Ruslan Ermilov <ru@nginx.com> Mon Jan 28 14:42:07 2013 +0000
tree 6f569820e77582fdd11c18fbb5a17401b340a86a
parent 33e934ccc8fcf4f62fbbd08c1eb1b396cac5facb

Secure_link: fixed configuration inheritance.

The "secure_link_secret" directive was always inherited from the outer
configuration level even when "secure_link" and "secure_link_md5" were
specified on the inner level.

src/http/modules/ngx_http_secure_link_module.c

diff --git a/src/http/modules/ngx_http_secure_link_module.c b/src/http/modules/ngx_http_secure_link_module.c
index b69b552..907ba6e 100644
--- a/src/http/modules/ngx_http_secure_link_module.c
+++ b/src/http/modules/ngx_http_secure_link_module.c
@@ -111,7 +111,7 @@
 
     conf = ngx_http_get_module_loc_conf(r, ngx_http_secure_link_module);
 
-    if (conf->secret.len) {
+    if (conf->secret.data) {
         return ngx_http_secure_link_old_variable(r, conf, v, data);
     }
 
@@ -318,7 +318,16 @@
     ngx_http_secure_link_conf_t *prev = parent;
     ngx_http_secure_link_conf_t *conf = child;
 
-    ngx_conf_merge_str_value(conf->secret, prev->secret, "");
+    if (conf->secret.data) {
+        if (conf->variable || conf->md5) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "\"secure_link_secret\" cannot be mixed with "
+                               "\"secure_link\" and \"secure_link_md5\"");
+            return NGX_CONF_ERROR;
+        }
+
+        return NGX_CONF_OK;
+    }
 
     if (conf->variable == NULL) {
         conf->variable = prev->variable;
@@ -328,6 +337,10 @@
         conf->md5 = prev->md5;
     }
 
+    if (conf->variable == NULL && conf->md5 == NULL) {
+        conf->secret = prev->secret;
+    }
+
     return NGX_CONF_OK;
 }