From fe8a327effce02bdec200e5b5a90b22b2e40af37 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 27 Dec 2007 14:15:34 +0000 Subject: [PATCH] return NGX_DECLINED if access directives are not active, this fixes case when satisfy any does not test active directives at all --- src/http/modules/ngx_http_access_module.c | 4 ++-- src/http/modules/ngx_http_auth_basic_module.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/http/modules/ngx_http_access_module.c b/src/http/modules/ngx_http_access_module.c index e4e87b243..44a2fbd89 100644 --- a/src/http/modules/ngx_http_access_module.c +++ b/src/http/modules/ngx_http_access_module.c @@ -98,7 +98,7 @@ ngx_http_access_handler(ngx_http_request_t *r) 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 @@ ngx_http_access_handler(ngx_http_request_t *r) } } - return NGX_OK; + return NGX_DECLINED; } diff --git a/src/http/modules/ngx_http_auth_basic_module.c b/src/http/modules/ngx_http_auth_basic_module.c index 72b4bbdcb..41e53cd94 100644 --- a/src/http/modules/ngx_http_auth_basic_module.c +++ b/src/http/modules/ngx_http_auth_basic_module.c @@ -113,7 +113,7 @@ ngx_http_auth_basic_handler(ngx_http_request_t *r) 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);