diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_open_file_cache.c | 1 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_file_cache.c | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_files.h | 12 |
5 files changed, 11 insertions, 9 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index d99076ec4..6bc104c7a 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -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" diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index 173980fa8..aa87fd22c 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -360,6 +360,7 @@ create: file->uses = 1; file->count = 0; + file->use_event = 0; file->event = NULL; add_event: diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 7c2bc0ec7..27a8bfc5e 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.8.1'; +our $VERSION = '0.8.2'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 248cd9455..323358742 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -320,6 +320,7 @@ ngx_http_file_cache_open(ngx_http_request_t *r) 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; } diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index cf5c3ed91..5395acd03 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -18,13 +18,13 @@ typedef ino_t ngx_file_uniq_t; 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; |