diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-08-13 15:11:45 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-08-13 15:11:45 +0400 |
| commit | 77d61350a4ac83166555b140e0995c57dcffd696 (patch) | |
| tree | 8d1cc18b76ce6decf004a53de504f82e5f2fcb96 /src/os/unix/ngx_darwin_sendfile_chain.c | |
| parent | 4aac91049f8909e928580f9fb8b752ba748f4167 (diff) | |
| download | nginx-77d61350a4ac83166555b140e0995c57dcffd696.tar.gz nginx-77d61350a4ac83166555b140e0995c57dcffd696.zip | |
Removed the "complete" variable from various send chain functions.
It was made redundant by the previous change, since the "sent" variable
is no longer modified.
Diffstat (limited to 'src/os/unix/ngx_darwin_sendfile_chain.c')
| -rw-r--r-- | src/os/unix/ngx_darwin_sendfile_chain.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c index b82800e78..67b740bd2 100644 --- a/src/os/unix/ngx_darwin_sendfile_chain.c +++ b/src/os/unix/ngx_darwin_sendfile_chain.c @@ -43,7 +43,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) u_char *prev; off_t size, send, prev_send, aligned, sent, fprev; off_t header_size, file_size; - ngx_uint_t eintr, complete; + ngx_uint_t eintr; ngx_err_t err; ngx_buf_t *file; ngx_array_t header, trailer; @@ -92,7 +92,6 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) file_size = 0; header_size = 0; eintr = 0; - complete = 0; prev_send = send; header.nelts = 0; @@ -311,10 +310,6 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) sent = rc > 0 ? rc : 0; } - if (send - prev_send == sent) { - complete = 1; - } - c->sent += sent; in = ngx_handle_sent_chain(in, sent); @@ -323,7 +318,7 @@ ngx_darwin_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) continue; } - if (!complete) { + if (send - prev_send != sent) { wev->ready = 0; return in; } |