diff options
Diffstat (limited to 'src/os/unix/freebsd/ngx_sendfile.c')
| -rw-r--r-- | src/os/unix/freebsd/ngx_sendfile.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/os/unix/freebsd/ngx_sendfile.c b/src/os/unix/freebsd/ngx_sendfile.c index dcbf68a3a..8de85f6f7 100644 --- a/src/os/unix/freebsd/ngx_sendfile.c +++ b/src/os/unix/freebsd/ngx_sendfile.c @@ -5,25 +5,25 @@ #include <ngx_core.h> #include <ngx_types.h> -#include <ngx_file.h> #include <ngx_socket.h> #include <ngx_errno.h> #include <ngx_log.h> +#include <ngx_connection.h> #include <ngx_sendv.h> #include <ngx_sendfile.h> /* CHECK: check sent if errno == EINTR then should return right sent. + EINTR should not occur according to man. */ -int ngx_sendfile(ngx_socket_t s, +int ngx_sendfile(ngx_connection_t *c, ngx_iovec_t *headers, int hdr_cnt, ngx_fd_t fd, off_t offset, size_t nbytes, ngx_iovec_t *trailers, int trl_cnt, - off_t *sent, - ngx_log_t *log) + off_t *sent, u_int flags) { int rc, i; ngx_err_t err; @@ -35,26 +35,29 @@ int ngx_sendfile(ngx_socket_t s, hdtr.trl_cnt = trl_cnt; #if (HAVE_FREEBSD_SENDFILE_NBYTES_BUG) - for (i = 0; i < hdr_cnt; i++) + for (i = 0; i < hdr_cnt; i++) { nbytes += headers[i].iov_len; + } #endif - rc = sendfile(fd, s, offset, nbytes, &hdtr, sent, 0); + rc = sendfile(fd, c->fd, offset, nbytes, &hdtr, sent, flags); if (rc == -1) { - err = ngx_socket_errno; + err = ngx_errno; if (err != NGX_EAGAIN && err != NGX_EINTR) { - ngx_log_error(NGX_LOG_ERR, log, err, - "ngx_sendfile: sendfile failed"); + ngx_log_error(NGX_LOG_ERR, c->log, err, "sendfile failed"); + return NGX_ERROR; } else { - ngx_log_error(NGX_LOG_INFO, log, err, - "ngx_sendfile: sendfile sent only %qd bytes", *sent); + ngx_log_error(NGX_LOG_INFO, c->log, err, + "sendfile sent only %qd bytes", *sent); + + return NGX_AGAIN; } } - ngx_log_debug(log, "ngx_sendfile: %d, @%qd %qd:%d" _ + ngx_log_debug(c->log, "sendfile: %d, @%qd %qd:%d" _ rc _ offset _ *sent _ nbytes); return NGX_OK; |