From: Roman Arutyunyan <arut@nginx.com>
Date: Mon, 3 Oct 2016 18:03:27 +0000 (+0300)
Subject: Addition filter: set last_in_chain flag when clearing last_buf.
X-Git-Tag: release-1.10.3~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=e19481f35e45dc6a0016dc11b63095d88137b719;p=nginx.git

Addition filter: set last_in_chain flag when clearing last_buf.

When the last_buf flag is cleared for add_after_body to append more data from a
subrequest, other filters may still have buffered data, which should be flushed
at this point.  For example, the sub_filter may have a partial match buffered,
which will only be flushed after the subrequest is done, ending up with
interleaved data in output.

Setting last_in_chain instead of last_buf flushes the data and fixes the order
of output buffers.
---

diff --git a/src/http/modules/ngx_http_addition_filter_module.c b/src/http/modules/ngx_http_addition_filter_module.c
index db4970bf1..2fad0e59b 100644
--- a/src/http/modules/ngx_http_addition_filter_module.c
+++ b/src/http/modules/ngx_http_addition_filter_module.c
@@ -171,6 +171,7 @@ ngx_http_addition_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     for (cl = in; cl; cl = cl->next) {
         if (cl->buf->last_buf) {
             cl->buf->last_buf = 0;
+            cl->buf->last_in_chain = 1;
             cl->buf->sync = 1;
             last = 1;
         }