]> git.kaiwu.me - nginx.git/commitdiff
Upstream: removed surplus ngx_resolve_name_done() call.
authorValentin Bartenev <vbart@nginx.com>
Thu, 4 Apr 2013 14:19:06 +0000 (14:19 +0000)
committerValentin Bartenev <vbart@nginx.com>
Thu, 4 Apr 2013 14:19:06 +0000 (14:19 +0000)
It will be called in ngx_http_upstream_finalize_request().

src/http/ngx_http_upstream.c

index a0c87db4aedc3356441387ef672873f6ba76c943..a7e88b77720d7e619db972b2ff04a91adc46f7c6 100644 (file)
@@ -3276,19 +3276,10 @@ ngx_http_upstream_cleanup(void *data)
 {
     ngx_http_request_t *r = data;
 
-    ngx_http_upstream_t  *u;
-
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "cleanup http upstream request: \"%V\"", &r->uri);
 
-    u = r->upstream;
-
-    if (u->resolved && u->resolved->ctx) {
-        ngx_resolve_name_done(u->resolved->ctx);
-        u->resolved->ctx = NULL;
-    }
-
-    ngx_http_upstream_finalize_request(r, u, NGX_DONE);
+    ngx_http_upstream_finalize_request(r, r->upstream, NGX_DONE);
 }