From e9b2cb1b9d286cffa8053e41c87b12ce265c4f25 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 9 Feb 2004 20:47:18 +0000 Subject: nginx-0.0.2-2004-02-09-23:47:18 import --- src/core/ngx_cycle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core/ngx_cycle.c') diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 845099814..f80271d24 100644 --- 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 *old_cycle) 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 *old_cycle) 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; } -- cgit