Mercurial > hg > nginx
comparison src/core/ngx_output_chain.c @ 5966:bcdfc39bf44d
Fixed AIO handling in the output chain.
The ctx->aio flag must be taken into account in the short path too.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Wed, 28 Jan 2015 21:33:06 +0300 |
parents | d620f497c50f |
children | ccad84a174e0 |
comparison
equal
deleted
inserted
replaced
5965:78271500b8de | 5966:bcdfc39bf44d |
---|---|
43 { | 43 { |
44 off_t bsize; | 44 off_t bsize; |
45 ngx_int_t rc, last; | 45 ngx_int_t rc, last; |
46 ngx_chain_t *cl, *out, **last_out; | 46 ngx_chain_t *cl, *out, **last_out; |
47 | 47 |
48 if (ctx->in == NULL && ctx->busy == NULL) { | 48 if (ctx->in == NULL && ctx->busy == NULL |
49 | 49 #if (NGX_HAVE_FILE_AIO) |
50 && !ctx->aio | |
51 #endif | |
52 ) | |
53 { | |
50 /* | 54 /* |
51 * the short path for the case when the ctx->in and ctx->busy chains | 55 * the short path for the case when the ctx->in and ctx->busy chains |
52 * are empty, the incoming chain is empty too or has the single buf | 56 * are empty, the incoming chain is empty too or has the single buf |
53 * that does not require the copy | 57 * that does not require the copy |
54 */ | 58 */ |