diff options
| -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/perl/nginx.pm | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_files.c | 10 |
5 files changed, 23 insertions, 3 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.7.13 26 Aug 2008 + + *) Bugfix: nginx could not be built on Linux and Solaris; the bug had + appeared in 0.7.12. + + Changes with nginx 0.7.12 26 Aug 2008 *) Feature: the "server_name" directive supports empty name "". diff --git a/CHANGES.ru b/CHANGES.ru index 9b9606602..3bb2175d4 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.7.13 26.08.2008 + + *) Исправление: nginx не собирался на Linux и Solaris; ошибка появилась + в 0.7.12. + + Изменения в nginx 0.7.12 26.08.2008 *) Добавление: директива server_name поддерживает пустое имя "". diff --git a/src/core/nginx.h b/src/core/nginx.h index de037a4d3..d16f2576d 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.7.12" +#define NGINX_VERSION "0.7.13" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 44d3c06db..4e18a65fe 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.7.12'; +our $VERSION = '0.7.13'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index d3abdd9e2..8d2733821 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -280,7 +280,15 @@ ngx_open_glob(ngx_glob_t *gl) ngx_int_t ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name) { - if (gl->n < (size_t) gl->pglob.gl_matchc) { + size_t count; + +#ifdef GLOB_NOMATCH + count = (size_t) gl->pglob.gl_pathc; +#else + count = (size_t) gl->pglob.gl_matchc; +#endif + + if (gl->n < count) { name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]); name->data = (u_char *) gl->pglob.gl_pathv[gl->n]; |