diff src/core/ngx_cycle.c @ 255:e6938ca7331a

nginx-0.0.2-2004-02-09-23:47:18 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 09 Feb 2004 20:47:18 +0000
parents 2a0540287298
children 70e1c7d2b83d
line wrap: on
line diff
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -46,6 +46,7 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t 
     cycle->pool = pool;
 
     cycle->old_cycle = old_cycle;
+    cycle->conf_file = old_cycle->conf_file;
 
 
     n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10;
@@ -117,10 +118,8 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t 
     conf.module_type = NGX_CORE_MODULE;
     conf.cmd_type = NGX_MAIN_CONF;
 
-    conf_file.len = sizeof(NGINX_CONF) - 1;
-    conf_file.data = NGINX_CONF;
 
-    if (ngx_conf_parse(&conf, &conf_file) != NGX_CONF_OK) {
+    if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) {
         ngx_destroy_pool(pool);
         return NULL;
     }