Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_rewrite_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 | 912ce4113f21 |
children | d51b734b4540 |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
218 { | 218 { |
219 ngx_http_rewrite_loc_conf_t *conf; | 219 ngx_http_rewrite_loc_conf_t *conf; |
220 | 220 |
221 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_rewrite_loc_conf_t)); | 221 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_rewrite_loc_conf_t)); |
222 if (conf == NULL) { | 222 if (conf == NULL) { |
223 return NGX_CONF_ERROR; | 223 return NULL; |
224 } | 224 } |
225 | 225 |
226 conf->stack_size = NGX_CONF_UNSET_UINT; | 226 conf->stack_size = NGX_CONF_UNSET_UINT; |
227 conf->log = NGX_CONF_UNSET; | 227 conf->log = NGX_CONF_UNSET; |
228 conf->uninitialized_variable_warn = NGX_CONF_UNSET; | 228 conf->uninitialized_variable_warn = NGX_CONF_UNSET; |
566 return NGX_CONF_ERROR; | 566 return NGX_CONF_ERROR; |
567 } | 567 } |
568 | 568 |
569 if_code = ngx_array_push_n(lcf->codes, sizeof(ngx_http_script_if_code_t)); | 569 if_code = ngx_array_push_n(lcf->codes, sizeof(ngx_http_script_if_code_t)); |
570 if (if_code == NULL) { | 570 if (if_code == NULL) { |
571 return NULL; | 571 return NGX_CONF_ERROR; |
572 } | 572 } |
573 | 573 |
574 if_code->code = ngx_http_script_if_code; | 574 if_code->code = ngx_http_script_if_code; |
575 | 575 |
576 elts = lcf->codes->elts; | 576 elts = lcf->codes->elts; |