Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssi_filter_module.c @ 3237:2efa8d2fcde1 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a6d6d762c554
children 5bc8811728f8
comparison
equal deleted inserted replaced
3236:9aa8fd2d5a00 3237:2efa8d2fcde1
2687 { 2687 {
2688 ngx_http_ssi_main_conf_t *smcf; 2688 ngx_http_ssi_main_conf_t *smcf;
2689 2689
2690 smcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_main_conf_t)); 2690 smcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_main_conf_t));
2691 if (smcf == NULL) { 2691 if (smcf == NULL) {
2692 return NGX_CONF_ERROR; 2692 return NULL;
2693 } 2693 }
2694 2694
2695 smcf->commands.pool = cf->pool; 2695 smcf->commands.pool = cf->pool;
2696 smcf->commands.temp_pool = cf->temp_pool; 2696 smcf->commands.temp_pool = cf->temp_pool;
2697 2697
2698 if (ngx_hash_keys_array_init(&smcf->commands, NGX_HASH_SMALL) != NGX_OK) { 2698 if (ngx_hash_keys_array_init(&smcf->commands, NGX_HASH_SMALL) != NGX_OK) {
2699 return NGX_CONF_ERROR; 2699 return NULL;
2700 } 2700 }
2701 2701
2702 return smcf; 2702 return smcf;
2703 } 2703 }
2704 2704
2734 { 2734 {
2735 ngx_http_ssi_loc_conf_t *slcf; 2735 ngx_http_ssi_loc_conf_t *slcf;
2736 2736
2737 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_loc_conf_t)); 2737 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_loc_conf_t));
2738 if (slcf == NULL) { 2738 if (slcf == NULL) {
2739 return NGX_CONF_ERROR; 2739 return NULL;
2740 } 2740 }
2741 2741
2742 /* 2742 /*
2743 * set by ngx_pcalloc(): 2743 * set by ngx_pcalloc():
2744 * 2744 *