Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_aio_read_chain.c @ 592:09d5f308901f NGINX_0_8_48
nginx 0.8.48
*) Change: now the "server_name" directive default value is an empty
name "".
Thanks to Gena Makhomed.
*) Change: now the "server_name_in_redirect" directive default value is
"off".
*) Feature: the $geoip_dma_code, $geoip_area_code, and
$geoip_region_name variables.
Thanks to Christine McGonagle.
*) Bugfix: the "proxy_pass", "fastcgi_pass", "uwsgi_pass", and
"scgi_pass" directives were not inherited inside "limit_except"
blocks.
*) Bugfix: the "proxy_cache_min_uses", "fastcgi_cache_min_uses"
"uwsgi_cache_min_uses", and "scgi_cache_min_uses" directives did not
work; the bug had appeared in 0.8.46.
*) Bugfix: the "fastcgi_split_path_info" directive used incorrectly
captures, if only parts of an URI were captured.
Thanks to Yuriy Taraday and Frank Enderle.
*) Bugfix: the "rewrite" directive did not escape a ";" character
during copying from URI to query string.
Thanks to Daisuke Murase.
*) Bugfix: the ngx_http_image_filter_module closed a connection, if an
image was larger than "image_filter_buffer" size.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 03 Aug 2010 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; }