diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2015-01-28 21:33:06 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2015-01-28 21:33:06 +0300 |
| commit | 314d0d40e75498431ab4d0bc772a41957fb6736c (patch) | |
| tree | d9aaed6b97bfd6c50d0041a13bcf15b73ecf5cac /src/core/ngx_output_chain.c | |
| parent | 415c8ec4b4b0bc3f2cd575f33b987661cc62e87d (diff) | |
| download | nginx-314d0d40e75498431ab4d0bc772a41957fb6736c.tar.gz nginx-314d0d40e75498431ab4d0bc772a41957fb6736c.zip | |
Fixed AIO handling in the output chain.
The ctx->aio flag must be taken into account in the short path too.
Diffstat (limited to 'src/core/ngx_output_chain.c')
| -rw-r--r-- | src/core/ngx_output_chain.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index 3cb60ea73..9d7a8460f 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -45,8 +45,12 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) ngx_int_t rc, last; ngx_chain_t *cl, *out, **last_out; - if (ctx->in == NULL && ctx->busy == NULL) { - + if (ctx->in == NULL && ctx->busy == NULL +#if (NGX_HAVE_FILE_AIO) + && !ctx->aio +#endif + ) + { /* * the short path for the case when the ctx->in and ctx->busy chains * are empty, the incoming chain is empty too or has the single buf |