Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_aio_read_chain.c @ 326:9fc4ab6673f9 NGINX_0_6_7
nginx 0.6.7
*) Change: now the paths specified in the "include",
"auth_basic_user_file", "perl_modules", "ssl_certificate",
"ssl_certificate_key", and "ssl_client_certificate" directives are
relative to directory of nginx configuration file nginx.conf, but
not to nginx prefix directory.
*) Change: the --sysconfdir=PATH option in configure was canceled.
*) Change: the special make target "upgrade1" was defined for online
upgrade of 0.1.x versions.
*) Feature: the "server_name" and "valid_referers" directives support
regular expressions.
*) Feature: the "server" directive in the "upstream" context supports
the "backup" parameter.
*) Feature: the ngx_http_perl_module supports the
$r->discard_request_body.
*) Feature: the "add_header Last-Modified ..." directive changes the
"Last-Modified" response header line.
*) Bugfix: if an response different than 200 was returned to an request
with body and connection went to the keep-alive state after the
request, then nginx returned 400 for the next request.
*) Bugfix: a segmentation fault occurred in worker process if invalid
address was set in the "auth_http" directive.
*) Bugfix: now nginx uses default listen backlog value 511 on all
platforms except FreeBSD.
Thanks to Jiang Hong.
*) Bugfix: a worker process may got caught in an endless loop, if an
"server" inside "upstream" block was marked as "down"; bug appeared
in 0.6.6.
*) Bugfix: now Solaris sendfilev() is not used to transfer the client
request body to FastCGI-server via the unix domain socket.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Wed, 15 Aug 2007 00:00:00 +0400 |
| parents | df17fbafec8f |
| children | 86dad910eeb6 |
| 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 } |