[nginx] svn commit: r5168 - trunk/src/http

[vbart at nginx.com]

Author: vbart
Date: 2013-04-04 14:19:06 +0000 (Thu, 04 Apr 2013)
New Revision: 5168
URL: http://trac.nginx.org/nginx/changeset/5168/nginx

Log:
Upstream: removed surplus ngx_resolve_name_done() call.

It will be called in ngx_http_upstream_finalize_request().


Modified:
   trunk/src/http/ngx_http_upstream.c

Modified: trunk/src/http/ngx_http_upstream.c
===================================================================
--- trunk/src/http/ngx_http_upstream.c	2013-04-03 14:13:35 UTC (rev 5167)
+++ trunk/src/http/ngx_http_upstream.c	2013-04-04 14:19:06 UTC (rev 5168)
@@ -3276,19 +3276,10 @@
 {
     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);
 }