commit a741f8d0216d95a7ee0fbb8a24947de8842900c0
author Igor Sysoev <igor@sysoev.ru> Tue Mar 30 20:31:58 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Mar 30 20:31:58 2004 +0000
tree 39b3665a5cb0f7780a139eeea918316342fd92af
parent 6707ba90729c615ffa5bf5ea81b8d32c3d8bd6e4

nginx-0.0.3-2004-03-31-00:31:58 import

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index a19695c..8dc6102 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -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;