Mercurial > hg > nginx-vendor-0-7
annotate src/os/unix/ngx_aio_read_chain.c @ 502:89dc5654117c NGINX_0_7_63
nginx 0.7.63
*) Security: now "/../" are disabled in "Destination" request header
line.
*) Change: minimum supported OpenSSL version is 0.9.7.
*) Change: the "ask" parameter of the "ssl_verify_client" directive was
changed to the "optional" parameter and now it checks a client
certificate if it was offered.
Thanks to Brice Figureau.
*) Feature: now the "-V" switch shows TLS SNI support.
*) Feature: the $ssl_client_verify variable.
Thanks to Brice Figureau.
*) Feature: the "ssl_crl" directive.
Thanks to Brice Figureau.
*) Bugfix: the $ssl_client_cert variable usage corrupted memory; the
bug had appeared in 0.7.7.
Thanks to Sergey Zhuravlev.
*) Feature: now the start cache loader runs in a separate process; this
should improve large caches handling.
*) Feature: now temporary files and permanent storage area may reside
at different file systems.
*) Bugfix: nginx counted incorrectly disk cache size.
*) Change: now directive "gzip_disable msie6" does not disable gzipping
for MSIE 6.0 SV1.
*) Bugfix: nginx always added "Vary: Accept-Encoding" response header
line, if both "gzip_static" and "gzip_vary" were on.
*) Feature: the "proxy" parameter of the "geo" directive.
*) Feature: the ngx_http_geoip_module.
*) Feature: the "limit_rate_after" directive.
Thanks to Ivan Debnar.
*) Feature: the "limit_req_log_level" and "limit_conn_log_level"
directives.
*) Bugfix: now "limit_req" directive conforms to the leaky bucket
algorithm.
Thanks to Maxim Dounin.
*) Bugfix: in ngx_http_limit_req_module.
Thanks to Maxim Dounin.
*) Bugfix: now nginx allows underscores in a request method.
*) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did
not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate",
"X-Accel-Buffering", and "X-Accel-Charset" lines from backend
response header.
Thanks to Maxim Dounin.
*) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend
response header lines; the bug had appeared in 0.7.44.
Thanks to Maxim Dounin.
*) Feature: the "image_filter_transparency" directive.
*) Feature: the "image_filter" directive supports variables for setting
size.
*) Bugfix: in PNG alpha-channel support in the
ngx_http_image_filter_module.
*) Bugfix: in transparency support in the ngx_http_image_filter_module.
*) Feature: now several "perl_modules" directives may be used.
*) Bugfix: ngx_http_perl_module responses did not work in subrequests.
*) Bugfix: nginx sent '\0' in a "Location" response header line on
MKCOL request.
Thanks to Xie Zhenye.
*) Bugfix: an "error_page" directive did not redirect a 413 error; the
bug had appeared in 0.6.10.
*) Bugfix: in memory allocation error handling.
Thanks to Maxim Dounin and Kirill A. Korinskiy.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 26 Oct 2009 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 } |