changeset 408:df7b79c859c3 NGINX_0_7_13

nginx 0.7.13 *) Bugfix: nginx could not be built on Linux and Solaris; the bug had appeared in 0.7.12.
author Igor Sysoev <http://sysoev.ru>
date Tue, 26 Aug 2008 00:00:00 +0400
parents d1c2a7a85713
children d46814b99ca0
files CHANGES CHANGES.ru src/core/nginx.h src/http/modules/perl/nginx.pm src/os/unix/ngx_files.c
diffstat 5 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES
+++ b/CHANGES
@@ -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 "".
--- 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 поддерживает пустое имя "".
--- 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"
--- 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);
--- 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];