Mercurial > hg > nginx
comparison src/http/modules/ngx_http_xslt_filter_module.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 | 8ba95d7cab37 |
children | 415400fa0f10 |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
1170 { | 1170 { |
1171 ngx_http_xslt_filter_main_conf_t *conf; | 1171 ngx_http_xslt_filter_main_conf_t *conf; |
1172 | 1172 |
1173 conf = ngx_palloc(cf->pool, sizeof(ngx_http_xslt_filter_main_conf_t)); | 1173 conf = ngx_palloc(cf->pool, sizeof(ngx_http_xslt_filter_main_conf_t)); |
1174 if (conf == NULL) { | 1174 if (conf == NULL) { |
1175 return NGX_CONF_ERROR; | 1175 return NULL; |
1176 } | 1176 } |
1177 | 1177 |
1178 if (ngx_array_init(&conf->dtd_files, cf->pool, 1, | 1178 if (ngx_array_init(&conf->dtd_files, cf->pool, 1, |
1179 sizeof(ngx_http_xslt_file_t)) | 1179 sizeof(ngx_http_xslt_file_t)) |
1180 != NGX_OK) | 1180 != NGX_OK) |
1198 { | 1198 { |
1199 ngx_http_xslt_filter_loc_conf_t *conf; | 1199 ngx_http_xslt_filter_loc_conf_t *conf; |
1200 | 1200 |
1201 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_xslt_filter_loc_conf_t)); | 1201 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_xslt_filter_loc_conf_t)); |
1202 if (conf == NULL) { | 1202 if (conf == NULL) { |
1203 return NGX_CONF_ERROR; | 1203 return NULL; |
1204 } | 1204 } |
1205 | 1205 |
1206 /* | 1206 /* |
1207 * set by ngx_pcalloc(): | 1207 * set by ngx_pcalloc(): |
1208 * | 1208 * |