nginx-vendor-0-8: src/os/unix/ngx_freebsd_sendfile

comparison src/os/unix/ngx_freebsd_sendfile_chain.c @ 22:8b6db3bda591 NGINX_0_1_11

nginx 0.1.11 *) Feature: the worker_priority directive. *) Change: both tcp_nopush and tcp_nodelay directives affect the transferred response. *) Bugfix: nginx did not call initgroups(). Thanks to Andrew Sitnikov and Andrei Nigmatulin. *) Change: now the ngx_http_autoindex_module shows the file size in the bytes. *) Bugfix: the ngx_http_autoindex_module returned the 500 error if the broken symlink was in a directory. *) Bugfix: the files bigger than 4G could not be transferred using sendfile. *) Bugfix: if the backend was resolved to several backends and there was an error while the response waiting then process may got caught in an endless loop. *) Bugfix: the worker process may exit with the "unknown cycle" message when the /dev/poll method was used. *) Bugfix: "close() channel failed" errors. *) Bugfix: the autodetection of the "nobody" and "nogroup" groups. *) Bugfix: the send_lowat directive did not work on Linux. *) Bugfix: the segmentation fault occurred if there was no events section in configuration. *) Bugfix: nginx could not be built on OpenBSD. *) Bugfix: the double slashes in "://" in the URI were converted to ":/".

author	Igor Sysoev <http://sysoev.ru>
date	Thu, 02 Dec 2004 00:00:00 +0300
parents	6f8b0dc0f8dd
children	45fe5b98a9de

comparison

equal deleted inserted replaced

-:4eeb9cfef970
+:8b6db3bda591
 ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
 off_t limit)
 {
 int              rc;
 u_char          *prev;
-off_t            fprev, sent, send, sprev, aligned;
+off_t            size, send, prev_send, aligned, sent, fprev;
-size_t           hsize, fsize;
+size_t           header_size, file_size;
-ssize_t          size;
 ngx_uint_t       eintr, eagain, complete;
 ngx_err_t        err;
 ngx_buf_t       *file;
 ngx_array_t      header, trailer;
 ngx_event_t     *wev;
 return NGX_CHAIN_ERROR;
 }
 #endif
+/* the maximum limit size is the maximum size_t value - the page size */
+if (limit == 0 || limit > MAX_SIZE_T_VALUE - ngx_pagesize) {
+limit = MAX_SIZE_T_VALUE - ngx_pagesize;
+}
 send = 0;
 eagain = 0;
 header.elts = headers;
 header.size = sizeof(struct iovec);
 trailer.nalloc = NGX_TRAILERS;
 trailer.pool = c->pool;
 for ( ;; ) {
 file = NULL;
-fsize = 0;
+file_size = 0;
-hsize = 0;
+header_size = 0;
 eintr = 0;
 complete = 0;
-sprev = send;
+prev_send = send;
 header.nelts = 0;
 trailer.nelts = 0;
 /* create the header iovec and coalesce the neighbouring bufs */
 if (send + size > limit) {
 size = limit - send;
 }
 if (prev == cl->buf->pos) {
-iov->iov_len += size;
+iov->iov_len += (size_t) size;
 } else {
 if (!(iov = ngx_array_push(&header))) {
 return NGX_CHAIN_ERROR;
 }
 iov->iov_base = (void *) cl->buf->pos;
-iov->iov_len = size;
+iov->iov_len = (size_t) size;
 }
-prev = cl->buf->pos + size;
+prev = cl->buf->pos + (size_t) size;
-hsize += size;
+header_size += (size_t) size;
 send += size;
 }
 if (cl && cl->buf->in_file && send < limit) {
 file = cl->buf;
 /* coalesce the neighbouring file bufs */
 do {
-size = (size_t) (cl->buf->file_last - cl->buf->file_pos);
+size = cl->buf->file_last - cl->buf->file_pos;
 if (send + size > limit) {
 size = limit - send;
 aligned = (cl->buf->file_pos + size + ngx_pagesize - 1)
 if (aligned <= cl->buf->file_last) {
 size = aligned - cl->buf->file_pos;
 }
 }
-fsize += size;
+file_size += (size_t) size;
 send += size;
 fprev = cl->buf->file_pos + size;
 cl = cl->next;
 } while (cl
 if (send + size > limit) {
 size = limit - send;
 }
 if (prev == cl->buf->pos) {
-iov->iov_len += size;
+iov->iov_len += (size_t) size;
 } else {
 if (!(iov = ngx_array_push(&trailer))) {
 return NGX_CHAIN_ERROR;
 }
 iov->iov_base = (void *) cl->buf->pos;
-iov->iov_len = size;
+iov->iov_len = (size_t) size;
 }
-prev = cl->buf->pos + size;
+prev = cl->buf->pos + (size_t) size;
 send += size;
 cl = cl->next;
 }
 }
 * the "nbytes bug" of the old sendfile() syscall:
 * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771
 */
 if (ngx_freebsd_sendfile_nbytes_bug == 0) {
-hsize = 0;
+header_size = 0;
 }
 sent = 0;
 rc = sendfile(file->file->fd, c->fd, file->file_pos,
-fsize + hsize, &hdtr, &sent, 0);
+file_size + header_size, &hdtr, &sent, 0);
 if (rc == -1) {
 err = ngx_errno;
 if (err == NGX_EAGAIN || err == NGX_EINTR) {
 } else {
 eagain = 1;
 }
 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, err,
-"sendfile() sent only %O bytes",
+"sendfile() sent only %O bytes", sent);
-sent);
 } else {
 wev->error = 1;
 ngx_connection_error(c, err, "sendfile() failed");
 return NGX_CHAIN_ERROR;
 return NGX_CHAIN_ERROR;
 }
 ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
 "sendfile: %d, @%O %O:%uz",
-rc, file->file_pos, sent, fsize + hsize);
+rc, file->file_pos, sent, file_size + header_size);
 } else {
 rc = writev(c->fd, header.elts, header.nelts);
 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-"writev: %d of %uz", rc, hsize);
+"writev: %d of %uz", rc, header_size);
 if (rc == -1) {
 err = ngx_errno;
 if (err == NGX_EAGAIN || err == NGX_EINTR) {
 }
 sent = rc > 0 ? rc : 0;
 }
-if (send - sprev == sent) {
+if (send - prev_send == sent) {
 complete = 1;
 }
 c->sent += sent;
 continue;
 }
 if (ngx_buf_in_memory(cl->buf)) {
-cl->buf->pos += sent;
+cl->buf->pos += (size_t) sent;
 }
 if (cl->buf->in_file) {
 cl->buf->file_pos += sent;
 }

Mercurial > hg > nginx-vendor-0-8

comparison src/os/unix/ngx_freebsd_sendfile_chain.c @ 22:8b6db3bda591 NGINX_0_1_11