Mercurial > hg > nginx

comparison src/core/nginx.c @ 517:dadfa78d2270 release-0.1.33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
516:ea9642a65514 517:dadfa78d2270
438 ngx_argv[i] = ngx_alloc(len, cycle->log); 438 ngx_argv[i] = ngx_alloc(len, cycle->log);
439 if (ngx_argv[i] == NULL) { 439 if (ngx_argv[i] == NULL) {
440 return NGX_ERROR; 440 return NGX_ERROR;
441 } 441 }
442 442
443 ngx_cpystrn((u_char *) ngx_argv[i], (u_char *) argv[i], len); 443 (void) ngx_cpystrn((u_char *) ngx_argv[i], (u_char *) argv[i], len);
444 } 444 }
445 445
446 ngx_argv[i] = NULL; 446 ngx_argv[i] = NULL;
447 447
448 #endif 448 #endif
471 471
472 ccf->daemon = NGX_CONF_UNSET; 472 ccf->daemon = NGX_CONF_UNSET;
473 ccf->master = NGX_CONF_UNSET; 473 ccf->master = NGX_CONF_UNSET;
474 ccf->worker_processes = NGX_CONF_UNSET; 474 ccf->worker_processes = NGX_CONF_UNSET;
475 ccf->debug_points = NGX_CONF_UNSET; 475 ccf->debug_points = NGX_CONF_UNSET;
476 ccf->user = (ngx_uid_t) NGX_CONF_UNSET; 476 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT;
477 ccf->group = (ngx_gid_t) NGX_CONF_UNSET; 477 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT;
478 #if (NGX_THREADS) 478 #if (NGX_THREADS)
479 ccf->worker_threads = NGX_CONF_UNSET; 479 ccf->worker_threads = NGX_CONF_UNSET;
480 ccf->thread_stack_size = NGX_CONF_UNSET_SIZE; 480 ccf->thread_stack_size = NGX_CONF_UNSET_SIZE;
481 #endif 481 #endif
482 482
505 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024); 505 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024);
506 #endif 506 #endif
507 507
508 #if !(NGX_WIN32) 508 #if !(NGX_WIN32)
509 509
510 if (ccf->user == (uid_t) NGX_CONF_UNSET && geteuid() == 0) { 510 if (ccf->user == (uid_t) NGX_CONF_UNSET_UINT && geteuid() == 0) {
511 511
512 pwd = getpwnam(NGX_USER); 512 pwd = getpwnam(NGX_USER);
513 if (pwd == NULL) { 513 if (pwd == NULL) {
514 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, 514 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
515 "getpwnam(\"" NGX_USER "\") failed"); 515 "getpwnam(\"" NGX_USER "\") failed");
571 char *group; 571 char *group;
572 struct passwd *pwd; 572 struct passwd *pwd;
573 struct group *grp; 573 struct group *grp;
574 ngx_str_t *value; 574 ngx_str_t *value;
575 575
576 if (ccf->user != (uid_t) NGX_CONF_UNSET) { 576 if (ccf->user != (uid_t) NGX_CONF_UNSET_UINT) {
577 return "is duplicate"; 577 return "is duplicate";
578 } 578 }
579 579
580 if (geteuid() != 0) { 580 if (geteuid() != 0) {
581 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, 581 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,