IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not set last_buf flag in subrequests.

Browse Source 
The last_buf flag should only be set in the last buffer of the main request.
Otherwise, several last_buf flags can appear in output.  This can, for example,
break the chunked filter, which will include several final chunks in output.
This commit is contained in:
Roman Arutyunyan 2016-10-03 20:48:51 +03:00
parent 2e12afb955
commit f3bbd1c87f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_mp4_module.c
View File

@ -1144,7 +1144,7 @@ ngx_http_mp4_read_mdat_atom(ngx_http_mp4_file_t *mp4, uint64_t atom_data_size)
data = &mp4->mdat_data_buf;
data->file = &mp4->file;
data->in_file = 1;
data->last_buf = 1;
data->last_buf = (mp4->request == mp4->request->main) ? 1 : 0;
data->last_in_chain = 1;
data->file_last = mp4->offset + atom_data_size;

3
src/http/modules/ngx_http_range_filter_module.c
View File

@ -750,7 +750,8 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r,
buf->last -= (size_t) (last - range->end);
}
buf->last_buf = 1;
buf->last_buf = (r == r->main) ? 1 : 0;
buf->last_in_chain = 1;
*ll = cl;
cl->next = NULL;

2
src/http/ngx_http_special_response.c
View File

@ -792,7 +792,7 @@ ngx_http_send_refresh(ngx_http_request_t *r)
b->last = ngx_cpymem(p, ngx_http_msie_refresh_tail,
sizeof(ngx_http_msie_refresh_tail) - 1);
b->last_buf = 1;
b->last_buf = (r == r->main) ? 1 : 0;
b->last_in_chain = 1;
out.buf = b;