Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.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 | df9d91bb1e5a |
| children | 8254055b6693 |
comparison
equal
deleted
inserted
replaced
| 3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
|---|---|
| 4272 | 4272 |
| 4273 if (ngx_array_init(&umcf->upstreams, cf->pool, 4, | 4273 if (ngx_array_init(&umcf->upstreams, cf->pool, 4, |
| 4274 sizeof(ngx_http_upstream_srv_conf_t *)) | 4274 sizeof(ngx_http_upstream_srv_conf_t *)) |
| 4275 != NGX_OK) | 4275 != NGX_OK) |
| 4276 { | 4276 { |
| 4277 return NGX_CONF_ERROR; | 4277 return NULL; |
| 4278 } | 4278 } |
| 4279 | 4279 |
| 4280 return umcf; | 4280 return umcf; |
| 4281 } | 4281 } |
| 4282 | 4282 |