Mercurial > hg > nginx

comparison src/os/unix/ngx_linux_sendfile_chain.c @ 5916:e044893b4587

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged conditions in the ngx_*_sendfile_chain() functions. No functional changes.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 13 Aug 2014 15:11:45 +0400
parents ac3f78219f85
children 2c64b69daec5
comparison
equal deleted inserted replaced
5915:ac3f78219f85 5916:e044893b4587
64 64
65 header.iovs = headers; 65 header.iovs = headers;
66 header.nalloc = NGX_IOVS_PREALLOCATE; 66 header.nalloc = NGX_IOVS_PREALLOCATE;
67 67
68 for ( ;; ) { 68 for ( ;; ) {
69 file = NULL;
70 file_size = 0;
71 eintr = 0; 69 eintr = 0;
72 prev_send = send; 70 prev_send = send;
73 71
74 /* create the iovec and coalesce the neighbouring bufs */ 72 /* create the iovec and coalesce the neighbouring bufs */
75 73
154 /* coalesce the neighbouring file bufs */ 152 /* coalesce the neighbouring file bufs */
155 153
156 file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send); 154 file_size = (size_t) ngx_chain_coalesce_file(&cl, limit - send);
157 155
158 send += file_size; 156 send += file_size;
159 }
160
161 if (file) {
162 #if 1 157 #if 1
163 if (file_size == 0) { 158 if (file_size == 0) {
164 ngx_debug_point(); 159 ngx_debug_point();
165 return NGX_CHAIN_ERROR; 160 return NGX_CHAIN_ERROR;
166 } 161 }