backout r3325: postpone filter is a body only filter

diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c
index c3864bb4e4088c00e52d563bb8bb665f85d7fc9d..846053ff42ebbc38bd58276f835018e47da79def 100644 (file)
--- a/src/http/modules/ngx_http_chunked_filter_module.c
+++ b/src/http/modules/ngx_http_chunked_filter_module.c
@@ -53,6 +53,7 @@ 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 3d9a38e8921bbe9fee23831e1232a6e16cf6fb71..bc2840831e5c3511c1e1016891fc578140e19b8a 100644 (file)
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -151,6 +151,7 @@ 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 6af0a8ad112033e755278b472ddf39c452a2bcf1..0f6f1731a1cc5e7032ccd9dd35a1751aafe6531d 100644 (file)
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -176,6 +176,10 @@ 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;
     }