CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-07-03 07:12:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r2080 merge:

Browse source 
fix error when response parsed by sub filter, then by SSI filter
and some response parts are output as file buffers
This commit is contained in:
Igor Sysoev 2008-07-07 11:33:29 +00:00
parent 3d16f9aa0a
commit 7fd116cc92
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/http/modules/ngx_http_ssi_filter_module.c
View file

@ -558,8 +558,9 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
if (b->in_file) {
if (slcf->min_file_chunk < (size_t) (b->last - b->pos))
{
b->file_last = b->file_pos + (b->last - b->start);
b->file_pos += b->pos - b->start;
b->file_last = b->file_pos
+ (b->last - ctx->buf->pos);
b->file_pos += b->pos - ctx->buf->pos;
} else {
b->in_file = 0;

4
src/http/modules/ngx_http_sub_filter_module.c
View file

@ -322,8 +322,8 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
b->recycled = 0;
if (b->in_file) {
b->file_last = b->file_pos + (b->last - b->start);
b->file_pos += b->pos - b->start;
b->file_last = b->file_pos + (b->last - ctx->buf->pos);
b->file_pos += b->pos - ctx->buf->pos;
}
cl->next = NULL;