Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_aio_read_chain.c @ 564:da3c99095432 NGINX_0_8_34
nginx 0.8.34
*) Bugfix: nginx did not support all ciphers and digests used in client
certificates.
Thanks to Innocenty Enikeew.
*) Bugfix: nginx cached incorrectly FastCGI responses if there was
large stderr output before response.
*) Bugfix: nginx did not support HTTPS referrers.
*) Bugfix: nginx/Windows might not find file if path in configuration
was given in other character case; the bug had appeared in 0.8.34.
*) Bugfix: the $date_local variable has an incorrect value, if the "%s"
format was used.
Thanks to Maxim Dounin.
*) Bugfix: if ssl_session_cache was not set or was set to "none", then
during client certificate verify the error "session id context
uninitialized" might occur; the bug had appeared in 0.7.1.
*) Bugfix: a geo range returned default value if the range included two
or more /16 networks and did not begin at /16 network boundary.
*) Bugfix: a block used in a "stub" parameter of an "include" SSI
directive was output with "text/plain" MIME type.
*) Bugfix: $r->sleep() did not work; the bug had appeared in 0.8.11.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 03 Mar 2010 00:00:00 +0300 |
parents | 86dad910eeb6 |
children | d0f7a625f27c |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 #include <ngx_event.h> | |
10 | |
11 | |
126 | 12 ssize_t |
13 ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) | |
0 | 14 { |
15 int n; | |
16 u_char *buf, *prev; | |
17 size_t size; | |
18 ssize_t total; | |
19 | |
20 if (c->read->pending_eof) { | |
21 c->read->ready = 0; | |
22 return 0; | |
23 } | |
24 | |
25 total = 0; | |
26 | |
27 while (cl) { | |
28 | |
29 /* we can post the single aio operation only */ | |
30 | |
31 if (!c->read->ready) { | |
32 return total ? total : NGX_AGAIN; | |
33 } | |
34 | |
35 buf = cl->buf->last; | |
36 prev = cl->buf->last; | |
37 size = 0; | |
38 | |
39 /* coalesce the neighbouring bufs */ | |
40 | |
41 while (cl && prev == cl->buf->last) { | |
42 size += cl->buf->end - cl->buf->last; | |
43 prev = cl->buf->end; | |
44 cl = cl->next; | |
45 } | |
46 | |
47 n = ngx_aio_read(c, buf, size); | |
48 | |
49 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read: %d", n); | |
50 | |
51 if (n == NGX_AGAIN) { | |
52 return total ? total : NGX_AGAIN; | |
53 } | |
54 | |
55 if (n == NGX_ERROR) { | |
56 return NGX_ERROR; | |
57 } | |
58 | |
59 if (n == 0) { | |
60 c->read->pending_eof = 1; | |
61 if (total) { | |
62 c->read->eof = 0; | |
63 c->read->ready = 1; | |
64 } | |
65 return total; | |
66 } | |
67 | |
68 if (n > 0) { | |
69 total += n; | |
70 } | |
71 | |
72 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
73 "aio_read total: %d", total); | |
74 } | |
75 | |
76 return total ? total : NGX_AGAIN; | |
77 } |