Mercurial > hg > nginx

changeset 3324:616da2ea901f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove subrequest test in range header, chunked, and header filters: they are run after postpone filter which sends data only in main request context
author Igor Sysoev <igor@sysoev.ru>
date Mon, 16 Nov 2009 12:13:17 +0000
parents 9421e997c2c4
children 42c16d8bddbe
files src/http/modules/ngx_http_chunked_filter_module.c src/http/modules/ngx_http_range_filter_module.c src/http/ngx_http_header_filter_module.c
diffstat 3 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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_
     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);
--- 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_re
 
     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)
     {
--- 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_
 
     r->header_sent = 1;
 
-    if (r != r->main) {
-        return NGX_OK;
-    }
-
     if (r->http_version < NGX_HTTP_VERSION_10) {
         return NGX_OK;
     }