Mercurial > hg > nginx
comparison src/core/ngx_cycle.c @ 3237:2efa8d2fcde1 stable-0.7
merge r2903, r2911, r2912, r3002:
fix various failures handling
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 15:54:29 +0000 |
parents | 87da6664fb49 |
children | 8254055b6693 |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
214 | 214 |
215 module = ngx_modules[i]->ctx; | 215 module = ngx_modules[i]->ctx; |
216 | 216 |
217 if (module->create_conf) { | 217 if (module->create_conf) { |
218 rv = module->create_conf(cycle); | 218 rv = module->create_conf(cycle); |
219 if (rv == NGX_CONF_ERROR) { | 219 if (rv == NULL) { |
220 ngx_destroy_pool(pool); | 220 ngx_destroy_pool(pool); |
221 return NULL; | 221 return NULL; |
222 } | 222 } |
223 cycle->conf_ctx[ngx_modules[i]->index] = rv; | 223 cycle->conf_ctx[ngx_modules[i]->index] = rv; |
224 } | 224 } |