Mercurial > hg > nginx
comparison src/os/unix/ngx_files.c @ 501:d4ea69372b94 release-0.1.25
nginx-0.1.25-RELEASE import
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 12:38:37 +0000 |
parents | 2ff194b74f1e |
children | e48ebafc6939 |
comparison
equal
deleted
inserted
replaced
500:9a0f304470f5 | 501:d4ea69372b94 |
---|---|
129 off_t offset, ngx_pool_t *pool) | 129 off_t offset, ngx_pool_t *pool) |
130 { | 130 { |
131 u_char *prev; | 131 u_char *prev; |
132 size_t size; | 132 size_t size; |
133 ssize_t n; | 133 ssize_t n; |
134 ngx_err_t err; | |
135 ngx_array_t vec; | 134 ngx_array_t vec; |
136 struct iovec *iov, iovs[NGX_IOVS]; | 135 struct iovec *iov, iovs[NGX_IOVS]; |
137 | 136 |
138 /* use pwrite() if there is the only buf in a chain */ | 137 /* use pwrite() if there is the only buf in a chain */ |
139 | 138 |
160 while (cl && vec.nelts < IOV_MAX) { | 159 while (cl && vec.nelts < IOV_MAX) { |
161 if (prev == cl->buf->pos) { | 160 if (prev == cl->buf->pos) { |
162 iov->iov_len += cl->buf->last - cl->buf->pos; | 161 iov->iov_len += cl->buf->last - cl->buf->pos; |
163 | 162 |
164 } else { | 163 } else { |
165 if (!(iov = ngx_array_push(&vec))) { | 164 iov = ngx_array_push(&vec); |
165 if (iov == NULL) { | |
166 return NGX_ERROR; | 166 return NGX_ERROR; |
167 } | 167 } |
168 | 168 |
169 iov->iov_base = (void *) cl->buf->pos; | 169 iov->iov_base = (void *) cl->buf->pos; |
170 iov->iov_len = cl->buf->last - cl->buf->pos; | 170 iov->iov_len = cl->buf->last - cl->buf->pos; |