Mercurial > hg > nginx

changeset 691:fd8a64f5dd3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout O_NOATIME support, it requires CAP_FOWNER capability
author Igor Sysoev <igor@sysoev.ru>
date Thu, 14 Sep 2006 15:05:48 +0000
parents bd2a647882e4
children 0241b162d29d
files src/http/modules/ngx_http_index_module.c src/http/modules/ngx_http_static_module.c src/os/unix/ngx_files.h src/os/win32/ngx_files.h
diffstat 4 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_index_module.c
+++ b/src/http/modules/ngx_http_index_module.c
@@ -239,8 +239,7 @@ ngx_http_index_handler(ngx_http_request_
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
 
-        fd = ngx_open_file(ctx->path.data, NGX_FILE_RDONLY|NGX_FILE_NOATIME,
-                           NGX_FILE_OPEN);
+        fd = ngx_open_file(ctx->path.data, NGX_FILE_RDONLY, NGX_FILE_OPEN);
 
         if (fd == (ngx_fd_t) NGX_AGAIN) {
             ctx->current = i;
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -125,8 +125,7 @@ ngx_http_static_handler(ngx_http_request
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
-    fd = ngx_open_file(path.data, NGX_FILE_RDONLY|NGX_FILE_NOATIME,
-                       NGX_FILE_OPEN);
+    fd = ngx_open_file(path.data, NGX_FILE_RDONLY, NGX_FILE_OPEN);
 
     if (fd == NGX_INVALID_FILE) {
         err = ngx_errno;
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -28,11 +28,6 @@
 #define NGX_FILE_TRUNCATE        O_TRUNC
 #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_n         "close()"
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -42,7 +42,6 @@
 #define NGX_FILE_CREATE_OR_OPEN     OPEN_ALWAYS
 #define NGX_FILE_OPEN               OPEN_EXISTING
 #define NGX_FILE_APPEND             0
-#define NGX_FILE_NOATIME            0
 
 
 ngx_int_t ngx_file_append_mode(ngx_fd_t fd);