nginx-0.3.6-RELEASE importrelease-0.3.6

    *) Change: now the IMAP/POP3 proxy do not send the empty login to
       authorization server.

    *) Feature: the "log_format" supports the variables in the $name form.

    *) Bugfix: if at least in one server was no the "listen" directive,
       then nginx did not listen on the 80 port; the bug had appeared in
       0.3.3.

    *) Bugfix: if the URI part is omitted in "proxy_pass" directive, the
       the 80 port was always used.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 1e7229114..03d956d5d 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -212,12 +212,12 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
 
         last = ctx->output_filter(ctx->filter_ctx, out);
 
-        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
-        last_out = &out;
-
-        if (last == NGX_ERROR) {
+        if (last == NGX_ERROR || last == NGX_DONE) {
             return last;
         }
+
+        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
+        last_out = &out;
     }
 }