diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-12-27 14:15:34 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-27 14:15:34 +0000 |
commit | fe8a327effce02bdec200e5b5a90b22b2e40af37 (patch) | |
tree | dea615bb3143c1870b76824d710fa5e2c9307331 | |
parent | 11fbf473749f06c838a57821cca5e2f86a36e1a0 (diff) | |
download | nginx-fe8a327effce02bdec200e5b5a90b22b2e40af37.tar.gz nginx-fe8a327effce02bdec200e5b5a90b22b2e40af37.zip |
return NGX_DECLINED if access directives are not active,
this fixes case when satisfy any does not test active directives at all
-rw-r--r-- | src/http/modules/ngx_http_access_module.c | 4 | ||||
-rw-r--r-- | 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); |