Mercurial > hg > nginx

changeset 3331:e0bc43a52382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout r3325: postpone filter is a body only filter
author Igor Sysoev <igor@sysoev.ru>
date Mon, 16 Nov 2009 13:22:10 +0000
parents b3aaccf50be2
children aa550cb4159a
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, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_chunked_filter_module.c	Mon Nov 16 12:50:10 2009 +0000
+++ b/src/http/modules/ngx_http_chunked_filter_module.c	Mon Nov 16 13:22:10 2009 +0000
@@ -53,6 +53,7 @@
     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	Mon Nov 16 12:50:10 2009 +0000
+++ b/src/http/modules/ngx_http_range_filter_module.c	Mon Nov 16 13:22:10 2009 +0000
@@ -151,6 +151,7 @@
 
     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	Mon Nov 16 12:50:10 2009 +0000
+++ b/src/http/ngx_http_header_filter_module.c	Mon Nov 16 13:22:10 2009 +0000
@@ -176,6 +176,10 @@
 
     r->header_sent = 1;
 
+    if (r != r->main) {
+        return NGX_OK;
+    }
+
     if (r->http_version < NGX_HTTP_VERSION_10) {
         return NGX_OK;
     }