mirror of
https://github.com/nginx/nginx.git
synced 2024-12-17 15:17:48 +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.
78 lines
1.5 KiB
C
78 lines
1.5 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
#include <ngx_aio.h>
|
|
|
|
|
|
ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
|
|
{
|
|
int n;
|
|
u_char *buf, *prev;
|
|
size_t size;
|
|
ssize_t total;
|
|
|
|
if (c->read->pending_eof) {
|
|
c->read->ready = 0;
|
|
return 0;
|
|
}
|
|
|
|
total = 0;
|
|
|
|
while (cl) {
|
|
|
|
/* we can post the single aio operation only */
|
|
|
|
if (!c->read->ready) {
|
|
return total ? total : NGX_AGAIN;
|
|
}
|
|
|
|
buf = cl->buf->last;
|
|
prev = cl->buf->last;
|
|
size = 0;
|
|
|
|
/* coalesce the neighbouring bufs */
|
|
|
|
while (cl && prev == cl->buf->last) {
|
|
size += cl->buf->end - cl->buf->last;
|
|
prev = cl->buf->end;
|
|
cl = cl->next;
|
|
}
|
|
|
|
n = ngx_aio_read(c, buf, size);
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read: %d", n);
|
|
|
|
if (n == NGX_AGAIN) {
|
|
return total ? total : NGX_AGAIN;
|
|
}
|
|
|
|
if (n == NGX_ERROR) {
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
if (n == 0) {
|
|
c->read->pending_eof = 1;
|
|
if (total) {
|
|
c->read->eof = 0;
|
|
c->read->ready = 1;
|
|
}
|
|
return total;
|
|
}
|
|
|
|
if (n > 0) {
|
|
total += n;
|
|
}
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"aio_read total: %d", total);
|
|
}
|
|
|
|
return total ? total : NGX_AGAIN;
|
|
}
|