Mercurial > hg > nginx
diff src/core/nginx.c @ 517:dadfa78d2270 release-0.1.33
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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 23 May 2005 12:07:45 +0000 |
parents | 9b8c906f6e63 |
children | 6f00349b98e5 |
line wrap: on
line diff
--- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -440,7 +440,7 @@ ngx_save_argv(ngx_cycle_t *cycle, int ar 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 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 *c #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 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"; }