Mercurial > hg > nginx

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
254:98c77ca0f354 255:e6938ca7331a
44 return NULL; 44 return NULL;
45 } 45 }
46 cycle->pool = pool; 46 cycle->pool = pool;
47 47
48 cycle->old_cycle = old_cycle; 48 cycle->old_cycle = old_cycle;
49 cycle->conf_file = old_cycle->conf_file;
49 50
50 51
51 n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10; 52 n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10;
52 if (!(cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)))) { 53 if (!(cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)))) {
53 ngx_destroy_pool(pool); 54 ngx_destroy_pool(pool);
115 /* STUB */ conf.pool = cycle->pool; 116 /* STUB */ conf.pool = cycle->pool;
116 conf.log = log; 117 conf.log = log;
117 conf.module_type = NGX_CORE_MODULE; 118 conf.module_type = NGX_CORE_MODULE;
118 conf.cmd_type = NGX_MAIN_CONF; 119 conf.cmd_type = NGX_MAIN_CONF;
119 120
120 conf_file.len = sizeof(NGINX_CONF) - 1; 121
121 conf_file.data = NGINX_CONF; 122 if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) {
122
123 if (ngx_conf_parse(&conf, &conf_file) != NGX_CONF_OK) {
124 ngx_destroy_pool(pool); 123 ngx_destroy_pool(pool);
125 return NULL; 124 return NULL;
126 } 125 }
127 126
128 127