From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Jun 2010 11:46:43 +0000 (+0000)
Subject: merge r3515:
X-Git-Tag: release-0.7.66~9
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0625f491f427b4c4fc0b819ed6d0f5e1406d630c;p=nginx.git

merge r3515:

fix segfault: ngx_http_upstream_cleanup() cleans r->cleanup,
the bug had been introduced in r3426
---

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));