Mercurial > hg > nginx-vendor-0-6
annotate src/os/unix/ngx_aio_read_chain.c @ 356:b743d290eb3b NGINX_0_6_22
nginx 0.6.22
*) Change: now all ngx_http_perl_module methods return values copied to
perl's allocated memory.
*) Bugfix: if nginx was built with ngx_http_perl_module, the perl
before 5.8.6 was used, and perl supported threads, then during
reconfiguration the master process aborted; bug appeared in
0.5.9.
Thanks to Boris Zhmurov.
*) Bugfix: the ngx_http_perl_module methods may get invalid values of
the regex captures.
*) Bugfix: a segmentation fault occurred in worker process, if the
$r->has_request_body() method was called for a request whose small
request body was already received.
*) Bugfix: large_client_header_buffers did not freed before going to
keep-alive state.
Thanks to Olexander Shtepa.
*) Bugfix: the last address was missed in the $upstream_addr variable;
bug appeared in 0.6.18.
*) Bugfix: the "fastcgi_catch_stderr" directive did return error code;
now it returns 502 code, that can be rerouted to a next server using
the "fastcgi_next_upstream invalid_header" directive.
*) Bugfix: a segmentation fault occurred in master process if the
"fastcgi_catch_stderr" directive was used; bug appeared in
0.6.10.
Thanks to Manlio Perillo.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 19 Dec 2007 00:00:00 +0300 |
parents | df17fbafec8f |
children |
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 #include <ngx_aio.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 } |