From 5867c81fe6c9485937fe87c43634cdaab29b483b Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 5 Sep 2012 15:06:47 +0000 Subject: [PATCH] Write filter: replaced unneeded loop with one to free chains. Noted by Gabor Lekeny. --- src/http/ngx_http_write_filter_module.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c index 72b1f9b2f..fd44bc659 100644 --- a/src/http/ngx_http_write_filter_module.c +++ b/src/http/ngx_http_write_filter_module.c @@ -185,23 +185,19 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) } if (size == 0 && !(c->buffered & NGX_LOWLEVEL_BUFFERED)) { - if (last) { + if (last || flush) { + for (cl = r->out; cl; /* void */) { + ln = cl; + cl = cl->next; + ngx_free_chain(r->pool, ln); + } + r->out = NULL; c->buffered &= ~NGX_HTTP_WRITE_BUFFERED; return NGX_OK; } - if (flush) { - do { - r->out = r->out->next; - } while (r->out); - - c->buffered &= ~NGX_HTTP_WRITE_BUFFERED; - - return NGX_OK; - } - ngx_log_error(NGX_LOG_ALERT, c->log, 0, "the http output chain is empty");