Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_aio_read_chain.c @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 86dad910eeb6 |
children | d0f7a625f27c |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.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; }