Mercurial > hg > nginx-vendor-0-8
annotate src/os/unix/ngx_aio_read.c @ 58:b55cbf18157e NGINX_0_1_29
nginx 0.1.29
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; bug appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 12 May 2005 00:00:00 +0400 |
parents | 6f8b0dc0f8dd |
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 | |
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 | |
25 ssize_t ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size) | |
26 { | |
27 int n; | |
28 ngx_event_t *rev; | |
29 | |
30 rev = c->read; | |
31 | |
32 if (!rev->ready) { | |
33 ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second aio post"); | |
34 return NGX_AGAIN; | |
35 } | |
36 | |
37 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
38 "rev->complete: %d", rev->complete); | |
39 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
40 "aio size: %d", size); | |
41 | |
42 if (!rev->complete) { | |
43 ngx_memzero(&rev->aiocb, sizeof(struct aiocb)); | |
44 | |
45 rev->aiocb.aio_fildes = c->fd; | |
46 rev->aiocb.aio_buf = buf; | |
47 rev->aiocb.aio_nbytes = size; | |
48 | |
18 | 49 #if (NGX_HAVE_KQUEUE) |
0 | 50 rev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; |
51 rev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; | |
52 rev->aiocb.aio_sigevent.sigev_value.sigval_ptr = rev; | |
53 #endif | |
54 | |
55 if (aio_read(&rev->aiocb) == -1) { | |
56 ngx_log_error(NGX_LOG_CRIT, rev->log, ngx_errno, | |
57 "aio_read() failed"); | |
58 rev->error = 1; | |
59 return NGX_ERROR; | |
60 } | |
61 | |
62 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
63 "aio_read: #%d OK", c->fd); | |
64 | |
65 rev->active = 1; | |
66 rev->ready = 0; | |
67 } | |
68 | |
69 rev->complete = 0; | |
70 | |
71 n = aio_error(&rev->aiocb); | |
72 if (n == -1) { | |
73 ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, "aio_error() failed"); | |
74 rev->error = 1; | |
75 return NGX_ERROR; | |
76 } | |
77 | |
78 if (n != 0) { | |
79 if (n == NGX_EINPROGRESS) { | |
80 if (rev->ready) { | |
81 ngx_log_error(NGX_LOG_ALERT, c->log, n, | |
82 "aio_read() still in progress"); | |
83 rev->ready = 0; | |
84 } | |
85 return NGX_AGAIN; | |
86 } | |
87 | |
88 ngx_log_error(NGX_LOG_CRIT, c->log, n, "aio_read() failed"); | |
89 rev->error = 1; | |
90 rev->ready = 0; | |
91 return NGX_ERROR; | |
92 } | |
93 | |
94 n = aio_return(&rev->aiocb); | |
95 if (n == -1) { | |
96 ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, | |
97 "aio_return() failed"); | |
98 | |
99 rev->error = 1; | |
100 rev->ready = 0; | |
101 return NGX_ERROR; | |
102 } | |
103 | |
104 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, rev->log, 0, | |
105 "aio_read: #%d %d", c->fd, n); | |
106 | |
107 if (n == 0) { | |
108 rev->eof = 1; | |
109 rev->ready = 0; | |
110 } else { | |
111 rev->ready = 1; | |
112 } | |
113 | |
114 rev->active = 0; | |
115 | |
116 return n; | |
117 } |