Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 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 afea5259e05c
children f6bbe77794aa
comparison
equal deleted inserted replaced
5166:fc595eeb6c54 5167:85ee9d858dcb
3274 static void 3274 static void
3275 ngx_http_upstream_cleanup(void *data) 3275 ngx_http_upstream_cleanup(void *data)
3276 { 3276 {
3277 ngx_http_request_t *r = data; 3277 ngx_http_request_t *r = data;
3278 3278
3279 ngx_http_upstream_t *u;
3280
3281 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 3279 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3282 "cleanup http upstream request: \"%V\"", &r->uri); 3280 "cleanup http upstream request: \"%V\"", &r->uri);
3283 3281
3284 u = r->upstream; 3282 ngx_http_upstream_finalize_request(r, r->upstream, NGX_DONE);
3285
3286 if (u->resolved && u->resolved->ctx) {
3287 ngx_resolve_name_done(u->resolved->ctx);
3288 u->resolved->ctx = NULL;
3289 }
3290
3291 ngx_http_upstream_finalize_request(r, u, NGX_DONE);
3292 } 3283 }
3293 3284
3294 3285
3295 static void 3286 static void
3296 ngx_http_upstream_finalize_request(ngx_http_request_t *r, 3287 ngx_http_upstream_finalize_request(ngx_http_request_t *r,