Mercurial > hg > nginx
diff src/core/nginx.c @ 300:502b03d9d2a3
nginx-0.0.3-2004-03-31-00:31:58 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 30 Mar 2004 20:31:58 +0000 |
parents | 87e73f067470 |
children | 744965ec6275 |
line wrap: on
line diff
--- a/src/core/nginx.c Tue Mar 30 15:59:50 2004 +0000 +++ b/src/core/nginx.c Tue Mar 30 20:31:58 2004 +0000 @@ -36,6 +36,13 @@ offsetof(ngx_core_conf_t, master), NULL }, + { ngx_string("worker_processes"), + NGX_MAIN_CONF|NGX_CONF_TAKE1, + ngx_conf_set_core_num_slot, + 0, + offsetof(ngx_core_conf_t, worker_processes), + NULL }, + { ngx_string("pid"), NGX_MAIN_CONF|NGX_CONF_TAKE1, ngx_conf_set_core_str_slot, @@ -43,13 +50,6 @@ offsetof(ngx_core_conf_t, pid), NULL }, - { ngx_string("worker_reopen"), - NGX_MAIN_CONF|NGX_CONF_TAKE1, - ngx_conf_set_core_flag_slot, - 0, - offsetof(ngx_core_conf_t, worker_reopen), - NULL }, - ngx_null_command }; @@ -174,6 +174,10 @@ } } + if (ccf->worker_processes == NGX_CONF_UNSET) { + ccf->worker_processes = 1; + } + if (ccf->pid.len == 0) { ccf->pid.len = sizeof(NGINX_PID) - 1; ccf->pid.data = NGINX_PID; @@ -361,7 +365,7 @@ */ ccf->daemon = NGX_CONF_UNSET; ccf->master = NGX_CONF_UNSET; - ccf->worker_reopen = NGX_CONF_UNSET; + ccf->worker_processes = NGX_CONF_UNSET; ccf->user = (ngx_uid_t) NGX_CONF_UNSET; ccf->group = (ngx_gid_t) NGX_CONF_UNSET;