diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-10-02 14:57:39 +0000 |
---|---|---|
committer | Jonathan Kolb <jon@b0g.us> | 2006-10-02 14:57:39 +0000 |
commit | c4fe9f5cd38ca4e51d616b7429c0cabe947e90ad (patch) | |
tree | 7f3324677b73230f06655d3d2fd5ae067ba67dd2 | |
parent | de83cd47348ab958bd8209f745d41213f06a53f8 (diff) | |
download | nginx-c4fe9f5cd38ca4e51d616b7429c0cabe947e90ad.tar.gz |
CHANGES not updated for this versionv0.4.5
-rw-r--r-- | src/core/nginx.h | 2 | ||||
-rw-r--r-- | src/os/unix/ngx_files.c | 4 | ||||
-rw-r--r-- | src/os/unix/ngx_files.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 7185b9970..33c854d3e 100644 --- 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" diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 12e595ee8..50db532b6 100644 --- 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 *dir) 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]; diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 3e1e22519..72d3461a8 100644 --- 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, ngx_dir_t *dir); typedef struct { - int n; + size_t n; glob_t pglob; u_char *pattern; ngx_log_t *log; |