backout O_NOATIME support, it requires CAP_FOWNER capability

This commit is contained in:
Igor Sysoev 2006-09-14 15:05:48 +00:00
parent bd39d9f66b
commit fc54daadb1
4 changed files with 2 additions and 10 deletions

View File

@ -239,8 +239,7 @@ ngx_http_index_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
fd = ngx_open_file(ctx->path.data, NGX_FILE_RDONLY|NGX_FILE_NOATIME, fd = ngx_open_file(ctx->path.data, NGX_FILE_RDONLY, NGX_FILE_OPEN);
NGX_FILE_OPEN);
if (fd == (ngx_fd_t) NGX_AGAIN) { if (fd == (ngx_fd_t) NGX_AGAIN) {
ctx->current = i; ctx->current = i;

View File

@ -125,8 +125,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
fd = ngx_open_file(path.data, NGX_FILE_RDONLY|NGX_FILE_NOATIME, fd = ngx_open_file(path.data, NGX_FILE_RDONLY, NGX_FILE_OPEN);
NGX_FILE_OPEN);
if (fd == NGX_INVALID_FILE) { if (fd == NGX_INVALID_FILE) {
err = ngx_errno; err = ngx_errno;

View File

@ -28,11 +28,6 @@
#define NGX_FILE_TRUNCATE O_TRUNC #define NGX_FILE_TRUNCATE O_TRUNC
#define NGX_FILE_APPEND O_APPEND #define NGX_FILE_APPEND O_APPEND
#ifdef O_NOATIME
#define NGX_FILE_NOATIME O_NOATIME
#else
#define NGX_FILE_NOATIME 0
#endif
#define ngx_close_file close #define ngx_close_file close
#define ngx_close_file_n "close()" #define ngx_close_file_n "close()"

View File

@ -42,7 +42,6 @@
#define NGX_FILE_CREATE_OR_OPEN OPEN_ALWAYS #define NGX_FILE_CREATE_OR_OPEN OPEN_ALWAYS
#define NGX_FILE_OPEN OPEN_EXISTING #define NGX_FILE_OPEN OPEN_EXISTING
#define NGX_FILE_APPEND 0 #define NGX_FILE_APPEND 0
#define NGX_FILE_NOATIME 0
ngx_int_t ngx_file_append_mode(ngx_fd_t fd); ngx_int_t ngx_file_append_mode(ngx_fd_t fd);