comparison src/core/ngx_buf.c @ 6874:7cc2d3a96ea3

Fixed trailer construction with limit on FreeBSD and macOS. The ngx_chain_coalesce_file() function may produce more bytes to send then requested in the limit passed, as it aligns the last file position to send to memory page boundary. As a result, (limit - send) may become negative. This resulted in big positive number when converted to size_t while calling ngx_output_chain_to_iovec(). Another part of the problem is in ngx_chain_coalesce_file(): it changes cl to the next chain link even if the current buffer is only partially sent due to limit. Therefore, if a file buffer was not expected to be fully sent due to limit, and was followed by a memory buffer, nginx called sendfile() with a part of the file buffer, and the memory buffer in trailer. If there were enough room in the socket buffer, this resulted in a part of the file buffer being skipped, and corresponding part of the memory buffer sent instead. The bug was introduced in 8e903522c17a (1.7.8). Configurations affected are ones using limits, that is, limit_rate and/or sendfile_max_chunk, and memory buffers after file ones (may happen when using subrequests or with proxying with disk buffering). Fix is to explicitly check if (send < limit) before constructing trailer with ngx_output_chain_to_iovec(). Additionally, ngx_chain_coalesce_file() was modified to preserve unfinished file buffers in cl.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 20 Jan 2017 21:12:48 +0300
parents 40c2f3e06d23
children da9941c9b01b
comparison
equal deleted inserted replaced
6873:426828549afc 6874:7cc2d3a96ea3
244 & ~((off_t) ngx_pagesize - 1); 244 & ~((off_t) ngx_pagesize - 1);
245 245
246 if (aligned <= cl->buf->file_last) { 246 if (aligned <= cl->buf->file_last) {
247 size = aligned - cl->buf->file_pos; 247 size = aligned - cl->buf->file_pos;
248 } 248 }
249
250 total += size;
251 break;
249 } 252 }
250 253
251 total += size; 254 total += size;
252 fprev = cl->buf->file_pos + size; 255 fprev = cl->buf->file_pos + size;
253 cl = cl->next; 256 cl = cl->next;