IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-29 12:14:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable symlinks: error handling cleanup again.

Browse Source
This commit is contained in:
Maxim Dounin 2012-02-20 19:14:07 +00:00
parent 3c00e341ea
commit 6bb86e3d58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ngx_open_file_cache.c
View File

@ -590,10 +590,10 @@ ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of,
NGX_FILE_RDONLY|NGX_FILE_NONBLOCK,
NGX_FILE_OPEN, 0);
if (at_fd == NGX_FILE_ERROR) {
if (at_fd == NGX_INVALID_FILE) {
of->err = ngx_errno;
of->failed = ngx_openat_file_n;
return NGX_FILE_ERROR;
return NGX_INVALID_FILE;
}
at_name.len = 1;
@ -634,7 +634,7 @@ ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of,
if (at_fd != AT_FDCWD && ngx_close_file(at_fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
ngx_close_file_n " \"%V\" failed", at_name);
ngx_close_file_n " \"%V\" failed", &at_name);
}
p = cp + 1;
@ -692,7 +692,7 @@ failed:
if (at_fd != AT_FDCWD && ngx_close_file(at_fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
ngx_close_file_n " \"%V\" failed", at_name);
ngx_close_file_n " \"%V\" failed", &at_name);
}
return fd;