summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2013-04-04 14:19:06 +0000
committerValentin Bartenev <vbart@nginx.com>2013-04-04 14:19:06 +0000
commite297091c2853d986a49e99f13749e3f418fff266 (patch)
treefb7c9497f807a85536641c53365a7b21b609fec2
parentd88dffbf1addbb8315f3815cfd271557baae44eb (diff)
downloadnginx-e297091c2853d986a49e99f13749e3f418fff266.tar.gz
nginx-e297091c2853d986a49e99f13749e3f418fff266.tar.bz2
Upstream: removed surplus ngx_resolve_name_done() call.
It will be called in ngx_http_upstream_finalize_request().
-rw-r--r--src/http/ngx_http_upstream.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a0c87db4a..a7e88b777 100644
--- 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);
}