Mercurial > hg > nginx

changeset 1786:adca43955f79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
return NGX_DECLINED if access directives are not active, this fixes case when satisfy any does not test active directives at all
author Igor Sysoev <igor@sysoev.ru>
date Thu, 27 Dec 2007 14:15:34 +0000
parents 0673b54f34f7
children a37fe5ceacc4
files src/http/modules/ngx_http_access_module.c src/http/modules/ngx_http_auth_basic_module.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_access_module.c	Thu Dec 27 13:15:43 2007 +0000
+++ b/src/http/modules/ngx_http_access_module.c	Thu Dec 27 14:15:34 2007 +0000
@@ -98,7 +98,7 @@
     alcf = ngx_http_get_module_loc_conf(r, ngx_http_access_module);
 
     if (alcf->rules == NULL) {
-        return NGX_OK;
+        return NGX_DECLINED;
     }
 
     /* AF_INET only */
@@ -128,7 +128,7 @@
         }
     }
 
-    return NGX_OK;
+    return NGX_DECLINED;
 }
 
 
--- a/src/http/modules/ngx_http_auth_basic_module.c	Thu Dec 27 13:15:43 2007 +0000
+++ b/src/http/modules/ngx_http_auth_basic_module.c	Thu Dec 27 14:15:34 2007 +0000
@@ -113,7 +113,7 @@
     alcf = ngx_http_get_module_loc_conf(r, ngx_http_auth_basic_module);
 
     if (alcf->realm.len == 0 || alcf->user_file.len == 0) {
-        return NGX_OK;
+        return NGX_DECLINED;
     }
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_auth_basic_module);