changeset 500:13b908d5338a NGINX_0_8_2

nginx 0.8.2 *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on start up. *) Bugfix: open_file_cache might cache open file descriptors too long.
author Igor Sysoev <http://sysoev.ru>
date Mon, 15 Jun 2009 00:00:00 +0400
parents 2db7806a88bc
children 531b6bbae529
files CHANGES CHANGES.ru src/core/nginx.h src/core/ngx_open_file_cache.c src/http/modules/perl/nginx.pm src/http/ngx_http_file_cache.c src/os/unix/ngx_files.h
diffstat 7 files changed, 29 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Mon Jun 08 00:00:00 2009 +0400
+++ b/CHANGES	Mon Jun 15 00:00:00 2009 +0400
@@ -1,4 +1,12 @@
 
+Changes with nginx 0.8.2                                         15 Jun 2009
+
+    *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on 
+       start up.
+
+    *) Bugfix: open_file_cache might cache open file descriptors too long.
+
+
 Changes with nginx 0.8.1                                         08 Jun 2009
 
     *) Feature: the "updating" parameter in "proxy_cache_use_stale" and 
--- a/CHANGES.ru	Mon Jun 08 00:00:00 2009 +0400
+++ b/CHANGES.ru	Mon Jun 15 00:00:00 2009 +0400
@@ -1,4 +1,13 @@
 
+Изменения в nginx 0.8.2                                           15.06.2009
+
+    *) Исправление: во взаимодействии open_file_cache и proxy/fastcgi кэша 
+       на старте.
+
+    *) Исправление: open_file_cache мог кэшировать открытые файлы очень 
+       долго.
+
+
 Изменения в nginx 0.8.1                                           08.06.2009
 
     *) Добавление: параметр updating в директивах proxy_cache_use_stale и 
@@ -14,7 +23,7 @@
 
     *) Исправление: модуль ngx_http_image_filter_module не понимал формат 
        GIF87a.
-       Спасибо Денис Ильиных.
+       Спасибо Денису Ильиных.
 
     *) Исправление: nginx не собирался на Solaris 10 и более ранних; ошибка 
        появилась в 0.7.56.
--- a/src/core/nginx.h	Mon Jun 08 00:00:00 2009 +0400
+++ b/src/core/nginx.h	Mon Jun 15 00:00:00 2009 +0400
@@ -8,8 +8,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version         8001
-#define NGINX_VERSION      "0.8.1"
+#define nginx_version         8002
+#define NGINX_VERSION      "0.8.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
--- a/src/core/ngx_open_file_cache.c	Mon Jun 08 00:00:00 2009 +0400
+++ b/src/core/ngx_open_file_cache.c	Mon Jun 15 00:00:00 2009 +0400
@@ -360,6 +360,7 @@
 
     file->uses = 1;
     file->count = 0;
+    file->use_event = 0;
     file->event = NULL;
 
 add_event:
--- a/src/http/modules/perl/nginx.pm	Mon Jun 08 00:00:00 2009 +0400
+++ b/src/http/modules/perl/nginx.pm	Mon Jun 15 00:00:00 2009 +0400
@@ -47,7 +47,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.8.1';
+our $VERSION = '0.8.2';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/http/ngx_http_file_cache.c	Mon Jun 08 00:00:00 2009 +0400
+++ b/src/http/ngx_http_file_cache.c	Mon Jun 15 00:00:00 2009 +0400
@@ -320,6 +320,7 @@
             c->node->uses = 1;
             c->node->body_start = c->body_start;
             c->node->exists = 1;
+            c->node->uniq = of.uniq;
 
             cache->sh->size += (c->length + cache->bsize - 1) / cache->bsize;
         }
--- a/src/os/unix/ngx_files.h	Mon Jun 08 00:00:00 2009 +0400
+++ b/src/os/unix/ngx_files.h	Mon Jun 15 00:00:00 2009 +0400
@@ -18,13 +18,13 @@
 
 
 typedef struct {
-    DIR                        *dir;
-    struct dirent              *de;
-    struct stat                 info;
+    DIR                         *dir;
+    struct dirent               *de;
+    struct stat                  info;
 
-    unsigned                    type:8;
-    unsigned                    valid_info:1;
-    unsigned                    valid_type:1;
+    unsigned                     type:8;
+    unsigned                     valid_info:1;
+    unsigned                     valid_type:1;
 } ngx_dir_t;