From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 16 Nov 2009 12:13:17 +0000 (+0000)
Subject: remove subrequest test in range header, chunked, and header filters: they
X-Git-Tag: release-0.8.25~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c0ae4716ece5e48c4e82863959d3ae9ff6693e65;p=nginx.git

remove subrequest test in range header, chunked, and header filters: they
are run after postpone filter which sends data only in main request context
---

diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c
index 846053ff4..c3864bb4e 100644
--- a/src/http/modules/ngx_http_chunked_filter_module.c
+++ b/src/http/modules/ngx_http_chunked_filter_module.c
@@ -53,7 +53,6 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r)
     if (r->headers_out.status == NGX_HTTP_NOT_MODIFIED
         || r->headers_out.status == NGX_HTTP_NO_CONTENT
         || r->headers_out.status == NGX_HTTP_CREATED
-        || r != r->main
         || (r->method & NGX_HTTP_HEAD))
     {
         return ngx_http_next_header_filter(r);
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index bc2840831..3d9a38e89 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -151,7 +151,6 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
 
     if (r->http_version < NGX_HTTP_VERSION_10
         || r->headers_out.status != NGX_HTTP_OK
-        || r != r->main
         || r->headers_out.content_length_n == -1
         || !r->allow_ranges)
     {
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index 0f6f1731a..6af0a8ad1 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -176,10 +176,6 @@ ngx_http_header_filter(ngx_http_request_t *r)
 
     r->header_sent = 1;
 
-    if (r != r->main) {
-        return NGX_OK;
-    }
-
     if (r->http_version < NGX_HTTP_VERSION_10) {
         return NGX_OK;
     }