diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-02-09 20:47:18 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-02-09 20:47:18 +0000 |
| commit | e9b2cb1b9d286cffa8053e41c87b12ce265c4f25 (patch) | |
| tree | 6b2c484ef0839fecb1f8226b38a95c61f919b0e1 /src/core/ngx_cycle.c | |
| parent | f14d69e4cc76323296f10f5fc1fefedd81f9f6ec (diff) | |
| download | nginx-e9b2cb1b9d286cffa8053e41c87b12ce265c4f25.tar.gz nginx-e9b2cb1b9d286cffa8053e41c87b12ce265c4f25.zip | |
nginx-0.0.2-2004-02-09-23:47:18 import
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |