From 5ec0e3f5b601cf183a02939f4e3891f36575ccb8 Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Mon, 6 Aug 2007 14:37:42 +0000 Subject: [PATCH] Don't try to compress/decompress where there's a Content-Range. According to RFC2616, the range would have to apply *after* applying content-encoding, so anything that's been set before running the deflate filter is going to be broken. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@563154 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_deflate.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index 365a8378fe..959bdc1570 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -387,6 +387,12 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, return ap_pass_brigade(f->next, bb); } + /* We can't operate on Content-Ranges */ + if (apr_table_get(r->headers_out, "Content-Range") != NULL) { + ap_remove_output_filter(f); + return ap_pass_brigade(f->next, bb); + } + /* Some browsers might have problems with content types * other than text/html, so set gzip-only-text/html * (with browsermatch) for them @@ -715,6 +721,12 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, return ap_get_brigade(f->next, bb, mode, block, readbytes); } + /* We can't operate on Content-Ranges */ + if (apr_table_get(r->headers_in, "Content-Range") != NULL) { + ap_remove_input_filter(f); + return ap_get_brigade(f->next, bb, mode, block, readbytes); + } + /* Check whether request body is gzipped. * * If it is, we're transforming the contents, invalidating @@ -739,7 +751,6 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, apr_table_unset(r->headers_in, "Content-Length"); apr_table_unset(r->headers_in, "Content-MD5"); - apr_table_unset(r->headers_in, "Content-Range"); len = 10; rv = apr_brigade_flatten(ctx->bb, deflate_hdr, &len); @@ -968,6 +979,12 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, return ap_pass_brigade(f->next, bb); } + /* We can't operate on Content-Ranges */ + if (apr_table_get(r->headers_out, "Content-Range") != NULL) { + ap_remove_output_filter(f); + return ap_pass_brigade(f->next, bb); + } + /* * Let's see what our current Content-Encoding is. * Only inflate if gzipped. @@ -986,7 +1003,6 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, /* these are unlikely to be set anyway, but ... */ apr_table_unset(r->headers_out, "Content-Length"); apr_table_unset(r->headers_out, "Content-MD5"); - apr_table_unset(r->headers_out, "Content-Range"); f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); ctx->bb = apr_brigade_create(r->pool, f->c->bucket_alloc); -- 2.40.0