Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_aio_read_chain.c @ 92:45945fa8b8ba NGINX_0_2_0
nginx 0.2.0
*) The pid-file names used during online upgrade was changed and now is
not required a manual rename operation. The old master process adds
the ".oldbin" suffix to its pid-file and executes a new binary file.
The new master process creates usual pid-file without the ".newbin"
suffix. If the master process exits, then old master process renames
back its pid-file with the ".oldbin" suffix to the pid-file without
suffix.
*) Change: the "worker_connections" directive, new name of the
"connections" directive; now the directive specifies maximum number
of connections, but not maximum socket descriptor number.
*) Feature: SSL supports the session cache inside one worker process.
*) Feature: the "satisfy_any" directive.
*) Change: the ngx_http_access_module and ngx_http_auth_basic_module do
not run for subrequests.
*) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending"
directives.
*) Bugfix: if all backend using in load-balancing failed after one
error, then nginx did not try do connect to them during 60 seconds.
*) Bugfix: in IMAP/POP3 command argument parsing.
Thanks to Rob Mueller.
*) Bugfix: errors while using SSL in IMAP/POP3 proxy.
*) Bugfix: errors while using SSI and gzipping.
*) Bugfix: the "Expires" and "Cache-Control" header lines were omitted
from the 304 responses.
Thanks to Alexandr Kukushkin.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Fri, 23 Sep 2005 00:00:00 +0400 |
| parents | 72eb30262aac |
| children | df17fbafec8f |
| 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 | |
| 13 ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) | |
| 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 } |