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 2deec48193fe050392299fab971edbed9fe12b4c..352587a96f9cb1bd2bd0264e32e0c4889550919e 100644 (file)
--- 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));