Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_aio_write.c @ 676:bfa81a0490a2 NGINX_1_3_1
nginx 1.3.1
*) Security: now nginx/Windows ignores trailing dot in URI path
component, and does not allow URIs with ":$" in it.
Thanks to Vladimir Kochetkov, Positive Research Center.
*) Feature: the "proxy_pass", "fastcgi_pass", "scgi_pass", "uwsgi_pass"
directives, and the "server" directive inside the "upstream" block,
now support IPv6 addresses.
*) Feature: the "resolver" directive now support IPv6 addresses and an
optional port specification.
*) Feature: the "least_conn" directive inside the "upstream" block.
*) Feature: it is now possible to specify a weight for servers while
using the "ip_hash" directive.
*) Bugfix: a segmentation fault might occur in a worker process if the
"image_filter" directive was used; the bug had appeared in 1.3.0.
*) Bugfix: nginx could not be built with ngx_cpp_test_module; the bug
had appeared in 1.1.12.
*) Bugfix: access to variables from SSI and embedded perl module might
not work after reconfiguration.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_xslt_filter_module.
Thanks to Kuramoto Eiji.
*) Bugfix: memory leak if $geoip_org variable was used.
Thanks to Denis F. Latypoff.
*) Bugfix: in the "proxy_cookie_domain" and "proxy_cookie_path"
directives.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 05 Jun 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> extern int ngx_kqueue; ssize_t ngx_aio_write(ngx_connection_t *c, u_char *buf, size_t size) { int n; ngx_event_t *wev; wev = c->write; if (!wev->ready) { return NGX_AGAIN; } ngx_log_debug1(NGX_LOG_DEBUG_EVENT, wev->log, 0, "aio: wev->complete: %d", wev->complete); if (!wev->complete) { ngx_memzero(&wev->aiocb, sizeof(struct aiocb)); wev->aiocb.aio_fildes = c->fd; wev->aiocb.aio_buf = buf; wev->aiocb.aio_nbytes = size; #if (NGX_HAVE_KQUEUE) wev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue; wev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT; wev->aiocb.aio_sigevent.sigev_value.sigval_ptr = wev; #endif if (aio_write(&wev->aiocb) == -1) { ngx_log_error(NGX_LOG_CRIT, wev->log, ngx_errno, "aio_write() failed"); return NGX_ERROR; } ngx_log_debug0(NGX_LOG_DEBUG_EVENT, wev->log, 0, "aio_write: OK"); wev->active = 1; wev->ready = 0; } wev->complete = 0; n = aio_error(&wev->aiocb); if (n == -1) { ngx_log_error(NGX_LOG_CRIT, wev->log, ngx_errno, "aio_error() failed"); wev->error = 1; return NGX_ERROR; } if (n != 0) { if (n == NGX_EINPROGRESS) { if (wev->ready) { ngx_log_error(NGX_LOG_ALERT, wev->log, n, "aio_write() still in progress"); wev->ready = 0; } return NGX_AGAIN; } ngx_log_error(NGX_LOG_CRIT, wev->log, n, "aio_write() failed"); wev->error = 1; wev->ready = 0; #if 1 n = aio_return(&wev->aiocb); if (n == -1) { ngx_log_error(NGX_LOG_ALERT, wev->log, ngx_errno, "aio_return() failed"); } ngx_log_error(NGX_LOG_CRIT, wev->log, n, "aio_return() %d", n); #endif return NGX_ERROR; } n = aio_return(&wev->aiocb); if (n == -1) { ngx_log_error(NGX_LOG_ALERT, wev->log, ngx_errno, "aio_return() failed"); wev->error = 1; wev->ready = 0; return NGX_ERROR; } ngx_log_debug1(NGX_LOG_DEBUG_EVENT, wev->log, 0, "aio_write: %d", n); wev->active = 0; wev->ready = 1; return n; }