Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 3590:d963fa32847e stable-0.7
merge r3515:
fix segfault: ngx_http_upstream_cleanup() cleans r->cleanup,
the bug had been introduced in r3426
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 11:46:43 +0000 |
parents | 3354dfba9da4 |
children | 0d8b8c84bab7 |
comparison
equal
deleted
inserted
replaced
3589:1c2e8b92751d | 3590:d963fa32847e |
---|---|
361 | 361 |
362 u = r->upstream; | 362 u = r->upstream; |
363 | 363 |
364 if (u && u->cleanup) { | 364 if (u && u->cleanup) { |
365 ngx_http_upstream_cleanup(r); | 365 ngx_http_upstream_cleanup(r); |
366 *u->cleanup = NULL; | |
367 u->cleanup = NULL; | |
368 } | 366 } |
369 | 367 |
370 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); | 368 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); |
371 if (u == NULL) { | 369 if (u == NULL) { |
372 return NGX_ERROR; | 370 return NGX_ERROR; |