Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_aio_write.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_write(ngx_connection_t *c, u_char *buf, size_t size) | |
26 { | |
27 int n; | |
28 ngx_event_t *wev; | |
29 | |
30 wev = c->write; | |
31 | |
32 if (!wev->ready) { | |
33 return NGX_AGAIN; | |
34 } | |
35 | |
36 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, wev->log, 0, | |
37 "aio: wev->complete: %d", wev->complete); | |
38 | |
39 if (!wev->complete) { | |
40 ngx_memzero(&wev->aiocb, sizeof(struct aiocb)); | |
41 | |
42 wev->aiocb.aio_fildes = c->fd; | |
43 wev->aiocb.aio_buf = buf; | |
44 wev->aiocb.aio_nbytes = size; | |
45 | |
18 | 46 #if (NGX_HAVE_KQUEUE) |
0 | 47 wev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; |
48 wev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; | |
49 wev->aiocb.aio_sigevent.sigev_value.sigval_ptr = wev; | |
50 #endif | |
51 | |
52 if (aio_write(&wev->aiocb) == -1) { | |
53 ngx_log_error(NGX_LOG_CRIT, wev->log, ngx_errno, | |
54 "aio_write() failed"); | |
55 return NGX_ERROR; | |
56 } | |
57 | |
58 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, wev->log, 0, "aio_write: OK"); | |
59 | |
60 wev->active = 1; | |
61 wev->ready = 0; | |
62 } | |
63 | |
64 wev->complete = 0; | |
65 | |
66 n = aio_error(&wev->aiocb); | |
67 if (n == -1) { | |
68 ngx_log_error(NGX_LOG_CRIT, wev->log, ngx_errno, "aio_error() failed"); | |
69 wev->error = 1; | |
70 return NGX_ERROR; | |
71 } | |
72 | |
73 if (n != 0) { | |
74 if (n == NGX_EINPROGRESS) { | |
75 if (wev->ready) { | |
76 ngx_log_error(NGX_LOG_ALERT, wev->log, n, | |
77 "aio_write() still in progress"); | |
78 wev->ready = 0; | |
79 } | |
80 return NGX_AGAIN; | |
81 } | |
82 | |
83 ngx_log_error(NGX_LOG_CRIT, wev->log, n, "aio_write() failed"); | |
84 wev->error = 1; | |
85 wev->ready = 0; | |
86 | |
87 #if 1 | |
88 n = aio_return(&wev->aiocb); | |
89 if (n == -1) { | |
90 ngx_log_error(NGX_LOG_ALERT, wev->log, ngx_errno, | |
91 "aio_return() failed"); | |
92 } | |
93 | |
94 ngx_log_error(NGX_LOG_CRIT, wev->log, n, "aio_return() %d", n); | |
95 #endif | |
96 | |
97 return NGX_ERROR; | |
98 } | |
99 | |
100 n = aio_return(&wev->aiocb); | |
101 if (n == -1) { | |
102 ngx_log_error(NGX_LOG_ALERT, wev->log, ngx_errno, | |
103 "aio_return() failed"); | |
104 | |
105 wev->error = 1; | |
106 wev->ready = 0; | |
107 return NGX_ERROR; | |
108 } | |
109 | |
110 | |
111 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, wev->log, 0, "aio_write: %d", n); | |
112 | |
113 wev->active = 0; | |
114 wev->ready = 1; | |
115 | |
116 return n; | |
117 } |