# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1275911203 0
# Node ID d963fa32847e5808f4d59f60eae8a4db59cd1a71
# Parent  1c2e8b92751d4852ba8c23c756cbda2a05d46805
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
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -363,8 +363,6 @@ ngx_http_upstream_create(ngx_http_reques
 
     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));