aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-16 12:13:17 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-11-16 12:13:17 +0000
commitc0ae4716ece5e48c4e82863959d3ae9ff6693e65 (patch)
treec6951ec01c68ddf804a94442025df4e1e2e09a00 /src
parent6c71b88924cc93f38e38d4dc56c5afe6bbf11524 (diff)
downloadnginx-c0ae4716ece5e48c4e82863959d3ae9ff6693e65.tar.gz
nginx-c0ae4716ece5e48c4e82863959d3ae9ff6693e65.zip
remove subrequest test in range header, chunked, and header filters: they
are run after postpone filter which sends data only in main request context
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_chunked_filter_module.c1
-rw-r--r--src/http/modules/ngx_http_range_filter_module.c1
-rw-r--r--src/http/ngx_http_header_filter_module.c4
3 files changed, 0 insertions, 6 deletions
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;
}