mirror of
https://github.com/nginx/nginx.git
synced 2024-12-16 14:19:00 +08:00
0e5dc5cff6
*) Change: the "valid_referers" directive and the "$invalid_referer"
variable were moved to the new ngx_http_referer_module from the
ngx_http_rewrite_module.
*) Change: the "$apache_bytes_sent" variable name was changed to
"$body_bytes_sent".
*) Feature: the "$sent_http_..." variables.
*) Feature: the "if" directive supports the "=" and "!=" operations.
*) Feature: the "proxy_pass" directive supports the HTTPS protocol.
*) Feature: the "proxy_set_body" directive.
*) Feature: the "post_action" directive.
*) Feature: the ngx_http_empty_gif_module.
*) Feature: the "worker_cpu_affinity" directive for Linux.
*) Bugfix: the "rewrite" directive did not unescape URI part in
redirect, now it is unescaped except the %00-%25 and %7F-%FF
characters.
*) Bugfix: nginx could not be built by the icc 9.0 compiler.
*) Bugfix: if the SSI was enabled for zero size static file, then the
chunked response was encoded incorrectly.
119 lines
2.8 KiB
C
119 lines
2.8 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
#include <ngx_aio.h>
|
|
|
|
#if (NGX_HAVE_KQUEUE)
|
|
#include <ngx_kqueue_module.h>
|
|
#endif
|
|
|
|
|
|
/*
|
|
* the ready data requires 3 syscalls:
|
|
* aio_write(), aio_error(), aio_return()
|
|
* the non-ready data requires 4 (kqueue) or 5 syscalls:
|
|
* aio_write(), aio_error(), notifiction, aio_error(), aio_return()
|
|
* timeout, aio_cancel(), aio_error()
|
|
*/
|
|
|
|
ssize_t
|
|
ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size)
|
|
{
|
|
int n;
|
|
ngx_event_t *rev;
|
|
|
|
rev = c->read;
|
|
|
|
if (!rev->ready) {
|
|
ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second aio post");
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"rev->complete: %d", rev->complete);
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"aio size: %d", size);
|
|
|
|
if (!rev->complete) {
|
|
ngx_memzero(&rev->aiocb, sizeof(struct aiocb));
|
|
|
|
rev->aiocb.aio_fildes = c->fd;
|
|
rev->aiocb.aio_buf = buf;
|
|
rev->aiocb.aio_nbytes = size;
|
|
|
|
#if (NGX_HAVE_KQUEUE)
|
|
rev->aiocb.aio_sigevent.sigev_notify_kqueue = ngx_kqueue;
|
|
rev->aiocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
|
|
rev->aiocb.aio_sigevent.sigev_value.sigval_ptr = rev;
|
|
#endif
|
|
|
|
if (aio_read(&rev->aiocb) == -1) {
|
|
ngx_log_error(NGX_LOG_CRIT, rev->log, ngx_errno,
|
|
"aio_read() failed");
|
|
rev->error = 1;
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"aio_read: #%d OK", c->fd);
|
|
|
|
rev->active = 1;
|
|
rev->ready = 0;
|
|
}
|
|
|
|
rev->complete = 0;
|
|
|
|
n = aio_error(&rev->aiocb);
|
|
if (n == -1) {
|
|
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, "aio_error() failed");
|
|
rev->error = 1;
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
if (n != 0) {
|
|
if (n == NGX_EINPROGRESS) {
|
|
if (rev->ready) {
|
|
ngx_log_error(NGX_LOG_ALERT, c->log, n,
|
|
"aio_read() still in progress");
|
|
rev->ready = 0;
|
|
}
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
ngx_log_error(NGX_LOG_CRIT, c->log, n, "aio_read() failed");
|
|
rev->error = 1;
|
|
rev->ready = 0;
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
n = aio_return(&rev->aiocb);
|
|
if (n == -1) {
|
|
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
|
|
"aio_return() failed");
|
|
|
|
rev->error = 1;
|
|
rev->ready = 0;
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, rev->log, 0,
|
|
"aio_read: #%d %d", c->fd, n);
|
|
|
|
if (n == 0) {
|
|
rev->eof = 1;
|
|
rev->ready = 0;
|
|
} else {
|
|
rev->ready = 1;
|
|
}
|
|
|
|
rev->active = 0;
|
|
|
|
return n;
|
|
}
|