Mercurial > hg > nginx
changeset 5848:106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Previously, a file buffer start position was reset to the file start.
Now it's reset to the previous file buffer end. This fixes
reinitialization of requests having multiple successive parts of a
single file. Such requests are generated by fastcgi module.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Thu, 18 Sep 2014 16:37:16 +0400 |
parents | 52b4984d2b3c |
children | 810e97260edc |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Thu Sep 18 16:37:14 2014 +0400 +++ b/src/http/ngx_http_upstream.c Thu Sep 18 16:37:16 2014 +0400 @@ -1570,6 +1570,7 @@ static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u) { + off_t file_pos; ngx_chain_t *cl; if (u->reinit_request(r) != NGX_OK) { @@ -1591,9 +1592,17 @@ /* reinit the request chain */ + file_pos = 0; + for (cl = u->request_bufs; cl; cl = cl->next) { cl->buf->pos = cl->buf->start; - cl->buf->file_pos = 0; + + /* there is at most one file */ + + if (cl->buf->in_file) { + cl->buf->file_pos = file_pos; + file_pos = cl->buf->file_last; + } } /* reinit the subrequest's ngx_output_chain() context */