diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:01:24 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:01:24 +0000 |
| commit | 393300584e0fcd36356da7b7198e3f43afd97240 (patch) | |
| tree | 1e1ddfb66016aca7b9b2f0ea7f98fc52cb694d56 /src/http/ngx_http_upstream.c | |
| parent | ab00f267591c88b2c46d2e3c1e9dfd8f92765c6a (diff) | |
| download | nginx-393300584e0fcd36356da7b7198e3f43afd97240.tar.gz nginx-393300584e0fcd36356da7b7198e3f43afd97240.tar.bz2 | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index ed86a382c..943ef69e8 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -364,6 +364,7 @@ ngx_http_upstream_create(ngx_http_request_t *r) if (u && u->cleanup) { ngx_http_upstream_cleanup(r); *u->cleanup = NULL; + u->cleanup = NULL; } u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); @@ -2834,6 +2835,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r, if (u->cleanup) { *u->cleanup = NULL; + u->cleanup = NULL; } if (u->state && u->state->response_sec) { |