Mercurial > hg > nginx

changeset 5167:85ee9d858dcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: removed surplus ngx_resolve_name_done() call. It will be called in ngx_http_upstream_finalize_request().
author Valentin Bartenev <vbart@nginx.com>
date Thu, 04 Apr 2013 14:19:06 +0000
parents fc595eeb6c54
children 482fda984556
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -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);
 }