IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-29 20:24:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-05 17:18:33 +00:00
parent b4097d6093
commit 25870d8ea2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/ngx_http_upstream.c
View File

@ -1472,6 +1472,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u)
static ngx_int_t static ngx_int_t
ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
{ {
ngx_int_t rc;
ngx_uint_t status; ngx_uint_t status;
ngx_http_upstream_next_t *un; ngx_http_upstream_next_t *un;
@ -1491,8 +1492,14 @@ ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u)
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
if (u->stale_cache && (u->conf->cache_use_stale & un->mask)) { if (u->stale_cache && (u->conf->cache_use_stale & un->mask)) {
ngx_http_upstream_finalize_request(r, u,
ngx_http_upstream_cache_send(r, u)); rc = u->reinit_request(r);
if (rc == NGX_OK) {
rc = ngx_http_upstream_cache_send(r, u);
}
ngx_http_upstream_finalize_request(r, u, rc);
return NGX_OK; return NGX_OK;
} }
@ -2643,9 +2650,15 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
if (u->stale_cache && (u->conf->cache_use_stale & ft_type)) { if (u->stale_cache && (u->conf->cache_use_stale & ft_type)) {
ngx_int_t rc;
ngx_http_upstream_finalize_request(r, u, rc = u->reinit_request(r);
ngx_http_upstream_cache_send(r, u));
if (rc == NGX_OK) {
rc = ngx_http_upstream_cache_send(r, u);
}
ngx_http_upstream_finalize_request(r, u, rc);
return; return;
} }
#endif #endif