Mercurial > hg > nginx-vendor-current

changeset 240:7d7cee0d62e0 NGINX_0_4_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.5 *) Bugfix: nginx could not be built on Linux and Solaris; bug appeared in 0.4.4.
author Igor Sysoev <http://sysoev.ru>
date Mon, 02 Oct 2006 00:00:00 +0400
parents 4f355d4f0cfa
children c3cf292cce38
files src/core/nginx.h src/os/unix/ngx_files.c src/os/unix/ngx_files.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.4.4"
+#define NGINX_VER          "nginx/0.4.5"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -256,7 +256,7 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t 
 ngx_int_t
 ngx_open_glob(ngx_glob_t *gl)
 {
-    if (glob((char *) gl->pattern, 0, NULL, &gl->pglob) == 0) {
+    if (glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob) == 0) {
         return NGX_OK;
     }
 
@@ -267,7 +267,7 @@ ngx_open_glob(ngx_glob_t *gl)
 ngx_int_t
 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
 {
-    if (gl->n < gl->pglob.gl_pathc) {
+    if (gl->n < (size_t) gl->pglob.gl_pathc) {
 
         name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
         name->data = (u_char *) gl->pglob.gl_pathv[gl->n];
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -131,7 +131,7 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, 
 
 
 typedef struct {
-    int         n;
+    size_t      n;
     glob_t      pglob;
     u_char     *pattern;
     ngx_log_t  *log;