Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 3418:a076e1823737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delete u->cleanup mark, this fixes large values in $upstream_response_time, the bug had been introduced in r3007
author Igor Sysoev <igor@sysoev.ru>
date Fri, 29 Jan 2010 16:45:14 +0000
parents 9e7926763f87
children 58865853f29b
comparison
equal deleted inserted replaced
3417:15017418fd84 3418:a076e1823737
364 364
365 if (u && u->cleanup) { 365 if (u && u->cleanup) {
366 r->main->count++; 366 r->main->count++;
367 ngx_http_upstream_cleanup(r); 367 ngx_http_upstream_cleanup(r);
368 *u->cleanup = NULL; 368 *u->cleanup = NULL;
369 u->cleanup = NULL;
369 } 370 }
370 371
371 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); 372 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
372 if (u == NULL) { 373 if (u == NULL) {
373 return NGX_ERROR; 374 return NGX_ERROR;
2854 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 2855 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2855 "finalize http upstream request: %i", rc); 2856 "finalize http upstream request: %i", rc);
2856 2857
2857 if (u->cleanup) { 2858 if (u->cleanup) {
2858 *u->cleanup = NULL; 2859 *u->cleanup = NULL;
2860 u->cleanup = NULL;
2859 } 2861 }
2860 2862
2861 if (u->resolved && u->resolved->ctx) { 2863 if (u->resolved && u->resolved->ctx) {
2862 ngx_resolve_name_done(u->resolved->ctx); 2864 ngx_resolve_name_done(u->resolved->ctx);
2863 u->resolved->ctx = NULL; 2865 u->resolved->ctx = NULL;