commit e9b2cb1b9d286cffa8053e41c87b12ce265c4f25
author Igor Sysoev <igor@sysoev.ru> Mon Feb 09 20:47:18 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Feb 09 20:47:18 2004 +0000
tree 6b2c484ef0839fecb1f8226b38a95c61f919b0e1
parent f14d69e4cc76323296f10f5fc1fefedd81f9f6ec

nginx-0.0.2-2004-02-09-23:47:18 import

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 8450998..f80271d 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -46,6 +46,7 @@
     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 @@
     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;
     }