diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:46:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:46:43 +0000 |
| commit | 0625f491f427b4c4fc0b819ed6d0f5e1406d630c (patch) | |
| tree | 67ba36badcab8b487f7f82c44c41b62181a1eaa0 | |
| parent | 4fd0e896db3907370f2f2705f893a7dee50ef9ba (diff) | |
| download | nginx-0625f491f427b4c4fc0b819ed6d0f5e1406d630c.tar.gz | |
merge r3515:
fix segfault: ngx_http_upstream_cleanup() cleans r->cleanup,
the bug had been introduced in r3426
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 2deec4819..352587a96 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -363,8 +363,6 @@ ngx_http_upstream_create(ngx_http_request_t *r) if (u && u->cleanup) { ngx_http_upstream_cleanup(r); - *u->cleanup = NULL; - u->cleanup = NULL; } u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); |