Mercurial > hg > nginx

changeset 3590:d963fa32847e stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1c2e8b92751d
children b3cfbb1f0224
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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));