diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-11-27 14:35:19 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-11-27 14:35:19 +0000 |
| commit | fe3fe0e3bfbcfadce5ce7b41a244b8c77abca942 (patch) | |
| tree | c4fa28d37aaa4a91fb0b730d24870dbd91a6422a | |
| parent | 1095ae05c2302781704f2d42739e033a0f6de763 (diff) | |
| download | nginx-fe3fe0e3bfbcfadce5ce7b41a244b8c77abca942.tar.gz nginx-fe3fe0e3bfbcfadce5ce7b41a244b8c77abca942.tar.bz2 | |
r2161 merge:
consider log_not_found while testing index files
| -rw-r--r-- | src/http/modules/ngx_http_index_module.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c index 01e6cd59a..678664c3b 100644 --- a/src/http/modules/ngx_http_index_module.c +++ b/src/http/modules/ngx_http_index_module.c @@ -27,8 +27,8 @@ typedef struct { static ngx_int_t ngx_http_index_test_dir(ngx_http_request_t *r, ngx_http_core_loc_conf_t *clcf, u_char *path, u_char *last); -static ngx_int_t ngx_http_index_error(ngx_http_request_t *r, u_char *file, - ngx_err_t err); +static ngx_int_t ngx_http_index_error(ngx_http_request_t *r, + ngx_http_core_loc_conf_t *clcf, u_char *file, ngx_err_t err); static ngx_int_t ngx_http_index_init(ngx_conf_t *cf); static void *ngx_http_index_create_loc_conf(ngx_conf_t *cf); @@ -225,7 +225,7 @@ ngx_http_index_handler(ngx_http_request_t *r) } if (of.err == NGX_ENOTDIR || of.err == NGX_EACCES) { - return ngx_http_index_error(r, path.data, of.err); + return ngx_http_index_error(r, clcf, path.data, of.err); } if (!dir_tested) { @@ -303,7 +303,7 @@ ngx_http_index_test_dir(ngx_http_request_t *r, ngx_http_core_loc_conf_t *clcf, if (of.err == NGX_ENOENT) { *last = c; - return ngx_http_index_error(r, dir.data, NGX_ENOENT); + return ngx_http_index_error(r, clcf, dir.data, NGX_ENOENT); } if (of.err == NGX_EACCES) { @@ -340,7 +340,8 @@ ngx_http_index_test_dir(ngx_http_request_t *r, ngx_http_core_loc_conf_t *clcf, static ngx_int_t -ngx_http_index_error(ngx_http_request_t *r, u_char *file, ngx_err_t err) +ngx_http_index_error(ngx_http_request_t *r, ngx_http_core_loc_conf_t *clcf, + u_char *file, ngx_err_t err) { if (err == NGX_EACCES) { ngx_log_error(NGX_LOG_ERR, r->connection->log, err, @@ -349,8 +350,10 @@ ngx_http_index_error(ngx_http_request_t *r, u_char *file, ngx_err_t err) return NGX_HTTP_FORBIDDEN; } - ngx_log_error(NGX_LOG_ERR, r->connection->log, err, - "\"%s\" is not found", file); + if (clcf->log_not_found) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, err, + "\"%s\" is not found", file); + } return NGX_HTTP_NOT_FOUND; } |