comparison src/http/modules/ngx_http_proxy_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 31526449835f
children 61962127b166
comparison
equal deleted inserted replaced
3236:9aa8fd2d5a00 3237:2efa8d2fcde1
1882 { 1882 {
1883 ngx_http_proxy_loc_conf_t *conf; 1883 ngx_http_proxy_loc_conf_t *conf;
1884 1884
1885 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t)); 1885 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_loc_conf_t));
1886 if (conf == NULL) { 1886 if (conf == NULL) {
1887 return NGX_CONF_ERROR; 1887 return NULL;
1888 } 1888 }
1889 1889
1890 /* 1890 /*
1891 * set by ngx_pcalloc(): 1891 * set by ngx_pcalloc():
1892 * 1892 *