diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-01-11 15:26:57 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-01-11 15:26:57 +0000 |
| commit | df3254aa49c80b350ff4fa2eb50baf3cafbed71c (patch) | |
| tree | 15a72baf5205f698354f529e4ba2d5846b558c4a /src/core/ngx_output_chain.c | |
| parent | 04ebcd942969bc479b4cc680eab6bf01f488f12f (diff) | |
| download | nginx-release-0.3.20.tar.gz nginx-release-0.3.20.zip | |
nginx-0.3.20-RELEASE importrelease-0.3.20
*) Bugfix: in SSI handling.
*) Bugfix: the ngx_http_memcached_module did not support the keys in
the "/usr?args" form.
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 f2dab9c3b..4b8364a69 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -28,9 +28,10 @@ static ngx_int_t ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, ngx_int_t ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) { - int rc, last; off_t bsize; size_t size; + ngx_int_t rc, last; + ngx_uint_t recycled; ngx_chain_t *cl, *out, **last_out; if (ctx->in == NULL && ctx->busy == NULL) { @@ -131,6 +132,7 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) } else { size = ctx->bufs.size; + recycled = 1; if (ctx->in->buf->last_in_chain) { @@ -142,6 +144,7 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) */ size = (size_t) bsize; + recycled = 0; } else if (ctx->bufs.num == 1 && (bsize < (off_t) (ctx->bufs.size @@ -154,6 +157,7 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) */ size = (size_t) bsize; + recycled = 0; } } @@ -163,7 +167,7 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) } ctx->buf->tag = ctx->tag; - ctx->buf->recycled = 1; + ctx->buf->recycled = recycled; ctx->allocated++; } } |