From 4959ec482e14884e6c132ed0533c6d62bcc89405 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 23 May 2005 12:07:45 +0000 Subject: nginx-0.1.33-RELEASE import *) Bugfix: nginx could not be built with the --without-pcre parameter; the bug had appeared in 0.1.29. *) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one level cause the bus fault on start up. *) Bugfix: the HTTP protocol was specified in the HTTPS redirects. *) Bugfix: if the "rewrite" directive used the captures inside the "if" directive, then the 500 error code was returned. --- src/core/ngx_file.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/core/ngx_file.c') diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 46d2e0acb..efabd39b8 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -61,8 +61,8 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, n = ngx_next_temp_number(0); for ( ;; ) { - ngx_sprintf(file->name.data + path->name.len + 1 + path->len, - "%0muA%Z", n); + (void) ngx_sprintf(file->name.data + path->name.len + 1 + path->len, + "%0muA%Z", n); ngx_create_hashed_filename(file, path); @@ -123,7 +123,8 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, void ngx_create_hashed_filename(ngx_file_t *file, ngx_path_t *path) { - ngx_uint_t i, name, pos, level; + size_t name, pos, level; + ngx_uint_t i; name = file->name.len; pos = path->name.len + 1; @@ -151,8 +152,9 @@ ngx_create_hashed_filename(ngx_file_t *file, ngx_path_t *path) ngx_int_t ngx_create_path(ngx_file_t *file, ngx_path_t *path) { - int i, pos; - ngx_err_t err; + size_t pos; + ngx_err_t err; + ngx_uint_t i; pos = path->name.len; @@ -344,7 +346,7 @@ ngx_create_pathes(ngx_cycle_t *cycle, ngx_uid_t user) } } - if (user == (ngx_uid_t) -1) { + if (user == (ngx_uid_t) NGX_CONF_UNSET_UINT) { continue; } -- cgit