Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_aio_read_chain.c @ 676:bfa81a0490a2 NGINX_1_3_1
nginx 1.3.1
*) Security: now nginx/Windows ignores trailing dot in URI path
component, and does not allow URIs with ":$" in it.
Thanks to Vladimir Kochetkov, Positive Research Center.
*) Feature: the "proxy_pass", "fastcgi_pass", "scgi_pass", "uwsgi_pass"
directives, and the "server" directive inside the "upstream" block,
now support IPv6 addresses.
*) Feature: the "resolver" directive now support IPv6 addresses and an
optional port specification.
*) Feature: the "least_conn" directive inside the "upstream" block.
*) Feature: it is now possible to specify a weight for servers while
using the "ip_hash" directive.
*) Bugfix: a segmentation fault might occur in a worker process if the
"image_filter" directive was used; the bug had appeared in 1.3.0.
*) Bugfix: nginx could not be built with ngx_cpp_test_module; the bug
had appeared in 1.1.12.
*) Bugfix: access to variables from SSI and embedded perl module might
not work after reconfiguration.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_xslt_filter_module.
Thanks to Kuramoto Eiji.
*) Bugfix: memory leak if $geoip_org variable was used.
Thanks to Denis F. Latypoff.
*) Bugfix: in the "proxy_cookie_domain" and "proxy_cookie_path"
directives.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 05 Jun 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
660 | 4 * Copyright (C) Nginx, Inc. |
0 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_event.h> | |
11 | |
12 | |
126 | 13 ssize_t |
14 ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) | |
0 | 15 { |
16 int n; | |
17 u_char *buf, *prev; | |
18 size_t size; | |
19 ssize_t total; | |
20 | |
21 if (c->read->pending_eof) { | |
22 c->read->ready = 0; | |
23 return 0; | |
24 } | |
25 | |
26 total = 0; | |
27 | |
28 while (cl) { | |
29 | |
30 /* we can post the single aio operation only */ | |
31 | |
32 if (!c->read->ready) { | |
33 return total ? total : NGX_AGAIN; | |
34 } | |
35 | |
36 buf = cl->buf->last; | |
37 prev = cl->buf->last; | |
38 size = 0; | |
39 | |
40 /* coalesce the neighbouring bufs */ | |
41 | |
42 while (cl && prev == cl->buf->last) { | |
43 size += cl->buf->end - cl->buf->last; | |
44 prev = cl->buf->end; | |
45 cl = cl->next; | |
46 } | |
47 | |
48 n = ngx_aio_read(c, buf, size); | |
49 | |
50 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read: %d", n); | |
51 | |
52 if (n == NGX_AGAIN) { | |
53 return total ? total : NGX_AGAIN; | |
54 } | |
55 | |
56 if (n == NGX_ERROR) { | |
57 return NGX_ERROR; | |
58 } | |
59 | |
60 if (n == 0) { | |
61 c->read->pending_eof = 1; | |
62 if (total) { | |
63 c->read->eof = 0; | |
64 c->read->ready = 1; | |
65 } | |
66 return total; | |
67 } | |
68 | |
69 if (n > 0) { | |
70 total += n; | |
71 } | |
72 | |
73 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
74 "aio_read total: %d", total); | |
75 } | |
76 | |
77 return total ? total : NGX_AGAIN; | |
78 } |