diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
| commit | f7f963d7792fdf19ad11888d3a3e7460ea88dfd0 (patch) | |
| tree | 33fa551ca1e0e3d61474dad1bf148de45338b7b7 /src/core | |
| parent | df30d3db5655ce895726efd7ddff81f971727dbe (diff) | |
| download | nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.gz nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.bz2 | |
merge r2903, r2911, r2912, r3002:
fix various failures handling
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_cycle.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_output_chain.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 1e846f85d..fbfc9c676 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -216,7 +216,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) if (module->create_conf) { rv = module->create_conf(cycle); - if (rv == NGX_CONF_ERROR) { + if (rv == NULL) { ngx_destroy_pool(pool); return NULL; } diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index ee23e8fe1..6d6d241c1 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -314,12 +314,11 @@ ngx_output_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain, #endif + cl->next = NULL; *ll = cl; ll = &cl->next; } - *ll = NULL; - return NGX_OK; } |