diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2017-03-28 14:21:38 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2017-03-28 14:21:38 +0300 |
| commit | 9ad18e43ac2c9956399018cbb998337943988333 (patch) | |
| tree | 5fa775ea2ea833bb65b18714d3eafd3539a784b5 /src/http/modules/ngx_http_index_module.c | |
| parent | eb017e75cf1b1d82179935b0e23d0c3451b33a87 (diff) | |
| download | nginx-9ad18e43ac2c9956399018cbb998337943988333.tar.gz nginx-9ad18e43ac2c9956399018cbb998337943988333.tar.bz2 | |
Fixed ngx_open_cached_file() error handling.
If of.err is 0, it means that there was a memory allocation error
and no further logging and/or processing is needed. The of.failed
string can be only accessed if of.err is not 0.
Diffstat (limited to 'src/http/modules/ngx_http_index_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_index_module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c index d3544db5b..c144b31c3 100644 --- a/src/http/modules/ngx_http_index_module.c +++ b/src/http/modules/ngx_http_index_module.c @@ -217,13 +217,13 @@ ngx_http_index_handler(ngx_http_request_t *r) if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) != NGX_OK) { - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, - "%s \"%s\" failed", of.failed, path.data); - if (of.err == 0) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, of.err, + "%s \"%s\" failed", of.failed, path.data); + #if (NGX_HAVE_OPENAT) if (of.err == NGX_EMLINK || of.err == NGX_ELOOP) |