Mercurial > hg > nginx-vendor-0-7
annotate src/os/unix/ngx_aio_read.c @ 508:68c0ae0a4959 NGINX_0_7_66
nginx 0.7.66
*) Security: now nginx/Windows ignores default file stream name.
Thanks to Jose Antonio Vazquez Gonzalez.
*) Change: now the charset filter runs before the SSI filter.
*) Change: now no message is written in an error log if a variable is
not found by $r->variable() method.
*) Change: now keepalive connections after POST requests are not
disabled for MSIE 7.0+.
Thanks to Adam Lounds.
*) Feature: the "proxy_no_cache" and "fastcgi_no_cache" directives.
*) Feature: now the "rewrite" directive does a redirect automatically
if the $scheme variable is used.
Thanks to Piotr Sikora.
*) Feature: the "chunked_transfer_encoding" directive.
*) Feature: the $geoip_city_continent_code, $geoip_latitude, and
$geoip_longitude variables.
Thanks to Arvind Sundararajan.
*) Feature: now the ngx_http_image_filter_module deletes always EXIF
and other application specific data if the data consume more than 5%
of a JPEG file.
*) Feature: now the "msie_padding" directive works for Chrome too.
*) Workaround: now keepalive connections are disabled for Safari.
Thanks to Joshua Sierles.
*) Bugfix: nginx ignored the "private" and "no-store" values in the
"Cache-Control" backend response header line.
*) Bugfix: an "&" character was not escaped when it was copied in
arguments part in a rewrite rule.
*) Bugfix: nginx might be terminated abnormally while a signal
processing or if the directive "timer_resolution" was used on
platforms which do not support kqueue or eventport notification
methods.
Thanks to George Xie and Maxim Dounin.
*) Bugfix: if temporary files and permanent storage area resided at
different file systems, then permanent file modification times were
incorrect.
Thanks to Maxim Dounin.
*) Bugfix: ngx_http_memcached_module might issue the error message
"memcached sent invalid trailer".
Thanks to Maxim Dounin.
*) Bugfix: nginx could not built zlib-1.2.4 library using the library
sources.
Thanks to Maxim Dounin.
*) Bugfix: values of the $query_string, $arg_..., etc. variables cached
in main request were used by the SSI module in subrequests.
*) 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.7.65.
*) Bugfix: the $date_local variable has an incorrect value, if the "%s"
format was used.
Thanks to Maxim Dounin.
*) Bugfix: nginx did not support all ciphers and digests used in client
certificates.
Thanks to Innocenty Enikeew.
*) 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: OpenSSL-1.0.0 compatibility on 64-bit Linux.
Thanks to Maxim Dounin.
*) 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: the $uid_got variable might not be used in the SSI and perl
modules.
*) Bugfix: a worker process hung if a FIFO file was requested.
Thanks to Vicente Aguilar and Maxim Dounin.
*) Bugfix: a variable value was repeatedly encoded after each an "echo"
SSI-command output; the bug had appeared in 0.6.14.
*) Bugfix: a "stub" parameter of an "include" SSI directive was not
used, if empty response has 200 status code.
*) Bugfix: a block used in a "stub" parameter of an "include" SSI
directive was output with "text/plain" MIME type.
*) Bugfix: if a proxied or FastCGI request was internally redirected to
another proxied or FastCGI location, then a segmentation fault might
occur in a worker process; the bug had appeared in 0.7.65.
Thanks to Yichun Zhang.
*) Bugfix: IMAP connections may hang until they timed out while talking
to Zimbra server.
Thanks to Alan Batie.
*) Bugfix: nginx did not support chunked transfer encoding for 201
responses.
Thanks to Julian Reich.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 00:00:00 +0400 |
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 | |
18 | 12 #if (NGX_HAVE_KQUEUE) |
0 | 13 #include <ngx_kqueue_module.h> |
14 #endif | |
15 | |
16 | |
17 /* | |
18 * the ready data requires 3 syscalls: | |
19 * aio_write(), aio_error(), aio_return() | |
20 * the non-ready data requires 4 (kqueue) or 5 syscalls: | |
21 * aio_write(), aio_error(), notifiction, aio_error(), aio_return() | |
22 * timeout, aio_cancel(), aio_error() | |
23 */ | |
24 | |
126 | 25 ssize_t |
26 ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size) | |
0 | 27 { |
28 int n; | |
29 ngx_event_t *rev; | |
30 | |
31 rev = c->read; | |
32 | |
33 if (!rev->ready) { | |
34 ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second aio post"); | |
35 return NGX_AGAIN; | |
36 } | |
37 | |
38 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
39 "rev->complete: %d", rev->complete); | |
40 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
41 "aio size: %d", size); | |
42 | |
43 if (!rev->complete) { | |
44 ngx_memzero(&rev->aiocb, sizeof(struct aiocb)); | |
45 | |
46 rev->aiocb.aio_fildes = c->fd; | |
47 rev->aiocb.aio_buf = buf; | |
48 rev->aiocb.aio_nbytes = size; | |
49 | |
18 | 50 #if (NGX_HAVE_KQUEUE) |
0 | 51 rev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; |
52 rev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; | |
53 rev->aiocb.aio_sigevent.sigev_value.sigval_ptr = rev; | |
54 #endif | |
55 | |
56 if (aio_read(&rev->aiocb) == -1) { | |
57 ngx_log_error(NGX_LOG_CRIT, rev->log, ngx_errno, | |
58 "aio_read() failed"); | |
59 rev->error = 1; | |
60 return NGX_ERROR; | |
61 } | |
62 | |
63 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
64 "aio_read: #%d OK", c->fd); | |
65 | |
66 rev->active = 1; | |
67 rev->ready = 0; | |
68 } | |
69 | |
70 rev->complete = 0; | |
71 | |
72 n = aio_error(&rev->aiocb); | |
73 if (n == -1) { | |
74 ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, "aio_error() failed"); | |
75 rev->error = 1; | |
76 return NGX_ERROR; | |
77 } | |
78 | |
79 if (n != 0) { | |
80 if (n == NGX_EINPROGRESS) { | |
81 if (rev->ready) { | |
82 ngx_log_error(NGX_LOG_ALERT, c->log, n, | |
83 "aio_read() still in progress"); | |
84 rev->ready = 0; | |
85 } | |
86 return NGX_AGAIN; | |
87 } | |
88 | |
89 ngx_log_error(NGX_LOG_CRIT, c->log, n, "aio_read() failed"); | |
90 rev->error = 1; | |
91 rev->ready = 0; | |
92 return NGX_ERROR; | |
93 } | |
94 | |
95 n = aio_return(&rev->aiocb); | |
96 if (n == -1) { | |
97 ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, | |
98 "aio_return() failed"); | |
99 | |
100 rev->error = 1; | |
101 rev->ready = 0; | |
102 return NGX_ERROR; | |
103 } | |
104 | |
105 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, rev->log, 0, | |
106 "aio_read: #%d %d", c->fd, n); | |
107 | |
108 if (n == 0) { | |
109 rev->eof = 1; | |
110 rev->ready = 0; | |
111 } else { | |
112 rev->ready = 1; | |
113 } | |
114 | |
115 rev->active = 0; | |
116 | |
117 return n; | |
118 } |