Mercurial > hg > nginx
diff src/os/unix/ngx_writev_chain.c @ 473:8e8f3af115b5 release-0.1.11
nginx-0.1.11-RELEASE import
*) 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 <igor@sysoev.ru> |
---|---|
date | Thu, 02 Dec 2004 18:40:46 +0000 |
parents | 2ff194b74f1e |
children | ad1e9ebf93bb |
line wrap: on
line diff
--- a/src/os/unix/ngx_writev_chain.c +++ b/src/os/unix/ngx_writev_chain.c @@ -16,7 +16,7 @@ ngx_chain_t *ngx_writev_chain(ngx_connec { u_char *prev; ssize_t n, size, sent; - off_t send, sprev; + off_t send, prev_send; ngx_uint_t eintr, complete; ngx_err_t err; ngx_array_t vec; @@ -42,6 +42,12 @@ ngx_chain_t *ngx_writev_chain(ngx_connec #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; complete = 0; @@ -54,7 +60,7 @@ ngx_chain_t *ngx_writev_chain(ngx_connec prev = NULL; iov = NULL; eintr = 0; - sprev = send; + prev_send = send; vec.nelts = 0; @@ -118,7 +124,7 @@ ngx_chain_t *ngx_writev_chain(ngx_connec ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "writev: %z", sent); - if (send - sprev == sent) { + if (send - prev_send == sent) { complete = 1; }