Mercurial > hg > nginx-quic
comparison src/http/ngx_http_upstream.c @ 3425:0189a8f4c7c3 stable-0.7
merge r2990, r3324, r3384, r3419:
various proxy/FastCGI fixes:
*) do auto redirect for proxy_pass/fastcgi_pass with variables
*) allow "proxy_pass http://$backend" without URI part
*) add conf/fastcgi.conf
*) delete u->cleanup mark, this fixes large values in $upstream_response_time,
the bug had been introduced in r3246
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 01 Feb 2010 14:01:24 +0000 |
parents | ef8cfb09a50b |
children | 3354dfba9da4 |
comparison
equal
deleted
inserted
replaced
3424:c6ecb3fe577b | 3425:0189a8f4c7c3 |
---|---|
362 u = r->upstream; | 362 u = r->upstream; |
363 | 363 |
364 if (u && u->cleanup) { | 364 if (u && u->cleanup) { |
365 ngx_http_upstream_cleanup(r); | 365 ngx_http_upstream_cleanup(r); |
366 *u->cleanup = NULL; | 366 *u->cleanup = NULL; |
367 u->cleanup = NULL; | |
367 } | 368 } |
368 | 369 |
369 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); | 370 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); |
370 if (u == NULL) { | 371 if (u == NULL) { |
371 return NGX_ERROR; | 372 return NGX_ERROR; |
2832 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 2833 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
2833 "finalize http upstream request: %i", rc); | 2834 "finalize http upstream request: %i", rc); |
2834 | 2835 |
2835 if (u->cleanup) { | 2836 if (u->cleanup) { |
2836 *u->cleanup = NULL; | 2837 *u->cleanup = NULL; |
2838 u->cleanup = NULL; | |
2837 } | 2839 } |
2838 | 2840 |
2839 if (u->state && u->state->response_sec) { | 2841 if (u->state && u->state->response_sec) { |
2840 tp = ngx_timeofday(); | 2842 tp = ngx_timeofday(); |
2841 u->state->response_sec = tp->sec - u->state->response_sec; | 2843 u->state->response_sec = tp->sec - u->state->response_sec; |