diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 12:07:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 12:07:45 +0000 |
| commit | 4959ec482e14884e6c132ed0533c6d62bcc89405 (patch) | |
| tree | 1993d130e544b3672fb4e612f805aaa8af140566 /src/core/nginx.c | |
| parent | debb8a42db100ed27e92cd8126b93844c8f9b3a8 (diff) | |
| download | nginx-4959ec482e14884e6c132ed0533c6d62bcc89405.tar.gz nginx-4959ec482e14884e6c132ed0533c6d62bcc89405.zip | |
nginx-0.1.33-RELEASE importrelease-0.1.33
*) 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.
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index bb6f093e4..7b98e1263 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -440,7 +440,7 @@ ngx_save_argv(ngx_cycle_t *cycle, int argc, char *const *argv) return NGX_ERROR; } - ngx_cpystrn((u_char *) ngx_argv[i], (u_char *) argv[i], len); + (void) ngx_cpystrn((u_char *) ngx_argv[i], (u_char *) argv[i], len); } ngx_argv[i] = NULL; @@ -473,8 +473,8 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle) ccf->master = NGX_CONF_UNSET; ccf->worker_processes = NGX_CONF_UNSET; ccf->debug_points = NGX_CONF_UNSET; - ccf->user = (ngx_uid_t) NGX_CONF_UNSET; - ccf->group = (ngx_gid_t) NGX_CONF_UNSET; + ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; + ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; #if (NGX_THREADS) ccf->worker_threads = NGX_CONF_UNSET; ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; @@ -507,7 +507,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) #if !(NGX_WIN32) - if (ccf->user == (uid_t) NGX_CONF_UNSET && geteuid() == 0) { + if (ccf->user == (uid_t) NGX_CONF_UNSET_UINT && geteuid() == 0) { pwd = getpwnam(NGX_USER); if (pwd == NULL) { @@ -573,7 +573,7 @@ ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) struct group *grp; ngx_str_t *value; - if (ccf->user != (uid_t) NGX_CONF_UNSET) { + if (ccf->user != (uid_t) NGX_CONF_UNSET_UINT) { return "is duplicate"; } |