changeset 234:c16038b14e68 NGINX_0_4_2

nginx 0.4.2 *) Bugfix: the O_NOATIME flag support on Linux was canceled; bug appeared in 0.4.1.
author Igor Sysoev <http://sysoev.ru>
date Thu, 14 Sep 2006 00:00:00 +0400
parents 56741fe3ea3b
children f622c719b711
files CHANGES CHANGES.ru src/core/nginx.h src/http/modules/ngx_http_index_module.c src/http/modules/ngx_http_static_module.c src/os/unix/ngx_files.h
diffstat 6 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Thu Sep 14 00:00:00 2006 +0400
+++ b/CHANGES	Thu Sep 14 00:00:00 2006 +0400
@@ -1,4 +1,10 @@
 
+Changes with nginx 0.4.2                                         14 Sep 2006
+
+    *) Bugfix: the O_NOATIME flag support on Linux was canceled; bug 
+       appeared in 0.4.1.
+
+
 Changes with nginx 0.4.1                                         14 Sep 2006
 
     *) Bugfix: the DragonFlyBSD compatibility.
--- a/CHANGES.ru	Thu Sep 14 00:00:00 2006 +0400
+++ b/CHANGES.ru	Thu Sep 14 00:00:00 2006 +0400
@@ -1,4 +1,10 @@
 
+Изменения в nginx 0.4.2                                           14.09.2006
+
+    *) Исправление: убрана поддержка флага O_NOATIME на Linux; ошибка 
+       появилась в 0.4.1.
+
+
 Изменения в nginx 0.4.1                                           14.09.2006
 
     *) Исправление: совместимость с DragonFlyBSD.
--- a/src/core/nginx.h	Thu Sep 14 00:00:00 2006 +0400
+++ b/src/core/nginx.h	Thu Sep 14 00:00:00 2006 +0400
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.4.1"
+#define NGINX_VER          "nginx/0.4.2"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
--- a/src/http/modules/ngx_http_index_module.c	Thu Sep 14 00:00:00 2006 +0400
+++ b/src/http/modules/ngx_http_index_module.c	Thu Sep 14 00:00:00 2006 +0400
@@ -239,8 +239,7 @@
             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	Thu Sep 14 00:00:00 2006 +0400
+++ b/src/http/modules/ngx_http_static_module.c	Thu Sep 14 00:00:00 2006 +0400
@@ -125,8 +125,7 @@
         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	Thu Sep 14 00:00:00 2006 +0400
+++ b/src/os/unix/ngx_files.h	Thu Sep 14 00:00:00 2006 +0400
@@ -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()"