mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed type of sendfile() return value on Linux.

Browse Source 
There was no real problem since the amount of bytes can be sent is limited by
NGX_SENDFILE_MAXSIZE to less than 2G.  But that can be changed in the future
This commit is contained in:
Valentin Bartenev 2014-11-19 21:18:13 +03:00
parent a301e1a706
commit 1276d8483e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/unix/ngx_linux_sendfile_chain.c
View File

@ -30,7 +30,7 @@
ngx_chain_t * ngx_chain_t *
ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
{ {
int rc, tcp_nodelay; int tcp_nodelay;
off_t send, prev_send, sent; off_t send, prev_send, sent;
size_t file_size; size_t file_size;
ssize_t n; ssize_t n;
@ -170,9 +170,9 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"sendfile: @%O %uz", file->file_pos, file_size); "sendfile: @%O %uz", file->file_pos, file_size);
rc = sendfile(c->fd, file->file->fd, &offset, file_size); n = sendfile(c->fd, file->file->fd, &offset, file_size);
if (rc == -1) { if (n == -1) {
err = ngx_errno; err = ngx_errno;
switch (err) { switch (err) {
@ -193,11 +193,11 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
"sendfile() is not ready"); "sendfile() is not ready");
} }
sent = rc > 0 ? rc : 0; sent = n > 0 ? n : 0;
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
"sendfile: %d, @%O %O:%uz", "sendfile: %z, @%O %O:%uz",
rc, file->file_pos, sent, file_size); n, file->file_pos, sent, file_size);
} else { } else {
n = ngx_writev(c, &header); n = ngx_writev(c, &header);