diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-09-14 15:29:18 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2006-09-14 15:29:18 +0000 |
| commit | 08436bafd02b5ebff369b0e94b6db4d7cea04f33 (patch) | |
| tree | 7956acad71d898d55e0674c814c25f2c4f3c5c14 | |
| parent | 403a071ee74e2d636bf65ad5a62baadcf773d3f1 (diff) | |
| download | nginx-0.4.2.tar.gz | |
Changes with nginx 0.4.2 14 Sep 2006v0.4.2
*) Bugfix: the O_NOATIME flag support on Linux was canceled; bug
appeared in 0.4.1.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_index_module.c | 3 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_static_module.c | 3 | ||||
| -rw-r--r-- | src/os/unix/ngx_files.h | 5 |
6 files changed, 15 insertions, 10 deletions
@@ -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. diff --git a/CHANGES.ru b/CHANGES.ru index 8a4d61600..5d70d7fd2 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -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. diff --git a/src/core/nginx.h b/src/core/nginx.h index db8eeee73..61824ddf4 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -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" diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c index b84a65e61..cd1c51ee5 100644 --- 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_t *r) 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; diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c index 414461099..f9df46eeb 100644 --- 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_t *r) 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; diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index a5724bd20..ff2515699 100644 --- 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()" |