mirror of
https://github.com/nginx/nginx.git
synced 2025-01-10 20:18:29 +08:00
c15717285d
*) 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.
241 lines
5.3 KiB
C
241 lines
5.3 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
|
|
|
|
#define NGX_IOVS 16
|
|
|
|
|
|
#if (NGX_HAVE_KQUEUE)
|
|
|
|
ssize_t
|
|
ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
|
|
{
|
|
u_char *prev;
|
|
ssize_t n, size;
|
|
ngx_err_t err;
|
|
ngx_array_t vec;
|
|
ngx_event_t *rev;
|
|
struct iovec *iov, iovs[NGX_IOVS];
|
|
|
|
rev = c->read;
|
|
|
|
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
|
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"readv: eof:%d, avail:%d, err:%d",
|
|
rev->pending_eof, rev->available, rev->kq_errno);
|
|
|
|
if (rev->available == 0) {
|
|
if (rev->pending_eof) {
|
|
rev->ready = 0;
|
|
rev->eof = 1;
|
|
|
|
ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno,
|
|
"kevent() reported about an closed connection");
|
|
|
|
if (rev->kq_errno) {
|
|
rev->error = 1;
|
|
ngx_set_socket_errno(rev->kq_errno);
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
return NGX_AGAIN;
|
|
}
|
|
}
|
|
}
|
|
|
|
prev = NULL;
|
|
iov = NULL;
|
|
size = 0;
|
|
|
|
vec.elts = iovs;
|
|
vec.nelts = 0;
|
|
vec.size = sizeof(struct iovec);
|
|
vec.nalloc = NGX_IOVS;
|
|
vec.pool = c->pool;
|
|
|
|
/* coalesce the neighbouring bufs */
|
|
|
|
while (chain) {
|
|
if (prev == chain->buf->last) {
|
|
iov->iov_len += chain->buf->end - chain->buf->last;
|
|
|
|
} else {
|
|
iov = ngx_array_push(&vec);
|
|
if (iov == NULL) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
iov->iov_base = (void *) chain->buf->last;
|
|
iov->iov_len = chain->buf->end - chain->buf->last;
|
|
}
|
|
|
|
size += chain->buf->end - chain->buf->last;
|
|
prev = chain->buf->end;
|
|
chain = chain->next;
|
|
}
|
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"readv: %d, last:%d", vec.nelts, iov->iov_len);
|
|
|
|
rev = c->read;
|
|
|
|
do {
|
|
n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
|
|
|
|
if (n >= 0) {
|
|
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
|
|
rev->available -= n;
|
|
|
|
/*
|
|
* rev->available can be negative here because some additional
|
|
* bytes can be received between kevent() and recv()
|
|
*/
|
|
|
|
if (rev->available <= 0) {
|
|
if (!rev->pending_eof) {
|
|
rev->ready = 0;
|
|
}
|
|
|
|
if (rev->available < 0) {
|
|
rev->available = 0;
|
|
}
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
if (n < size) {
|
|
rev->ready = 0;
|
|
}
|
|
|
|
if (n == 0) {
|
|
rev->eof = 1;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
err = ngx_socket_errno;
|
|
|
|
if (err == NGX_EAGAIN || err == NGX_EINTR) {
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
|
|
"readv() not ready");
|
|
n = NGX_AGAIN;
|
|
|
|
} else {
|
|
n = ngx_connection_error(c, err, "readv() failed");
|
|
break;
|
|
}
|
|
|
|
} while (err == NGX_EINTR);
|
|
|
|
rev->ready = 0;
|
|
|
|
if (n == NGX_ERROR){
|
|
c->read->error = 1;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
#else /* ! NGX_HAVE_KQUEUE */
|
|
|
|
ssize_t
|
|
ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
|
|
{
|
|
u_char *prev;
|
|
ssize_t n, size;
|
|
ngx_err_t err;
|
|
ngx_array_t vec;
|
|
ngx_event_t *rev;
|
|
struct iovec *iov, iovs[NGX_IOVS];
|
|
|
|
prev = NULL;
|
|
iov = NULL;
|
|
size = 0;
|
|
|
|
vec.elts = iovs;
|
|
vec.nelts = 0;
|
|
vec.size = sizeof(struct iovec);
|
|
vec.nalloc = NGX_IOVS;
|
|
vec.pool = c->pool;
|
|
|
|
/* coalesce the neighbouring bufs */
|
|
|
|
while (chain) {
|
|
if (prev == chain->buf->last) {
|
|
iov->iov_len += chain->buf->end - chain->buf->last;
|
|
|
|
} else {
|
|
iov = ngx_array_push(&vec);
|
|
if (iov == NULL) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
iov->iov_base = chain->buf->last;
|
|
iov->iov_len = chain->buf->end - chain->buf->last;
|
|
}
|
|
|
|
size += chain->buf->end - chain->buf->last;
|
|
prev = chain->buf->end;
|
|
chain = chain->next;
|
|
}
|
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"readv: %d:%d", vec.nelts, iov->iov_len);
|
|
|
|
rev = c->read;
|
|
|
|
do {
|
|
n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
|
|
|
|
if (n == 0) {
|
|
rev->ready = 0;
|
|
rev->eof = 1;
|
|
|
|
return n;
|
|
|
|
} else if (n > 0) {
|
|
|
|
if (n < size && !(ngx_event_flags & NGX_USE_GREEDY_EVENT)) {
|
|
rev->ready = 0;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
err = ngx_socket_errno;
|
|
|
|
if (err == NGX_EAGAIN || err == NGX_EINTR) {
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
|
|
"readv() not ready");
|
|
n = NGX_AGAIN;
|
|
|
|
} else {
|
|
n = ngx_connection_error(c, err, "readv() failed");
|
|
break;
|
|
}
|
|
|
|
} while (err == NGX_EINTR);
|
|
|
|
rev->ready = 0;
|
|
|
|
if (n == NGX_ERROR){
|
|
c->read->error = 1;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
#endif /* NGX_HAVE_KQUEUE */
|