Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 46990 invoked by uid 500); 4 Apr 2003 00:41:00 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 46973 invoked by uid 500); 4 Apr 2003 00:40:59 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 4 Apr 2003 00:40:58 -0000 Message-ID: <20030404004058.99512.qmail@icarus.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/filters mod_deflate.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N nd 2003/04/03 16:40:58 Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS modules/filters Tag: APACHE_2_0_BRANCH mod_deflate.c Log: Check also err_headers_out for an already set Content-Encoding: gzip header. This prevents gzip compressed content from a CGI script from being compressed once more. PR: 17797 Reviewed by: Ian Holsman, Jeff Trawick Revision Changes Path No revision No revision 1.988.2.74 +4 -1 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.988.2.73 retrieving revision 1.988.2.74 diff -u -r1.988.2.73 -r1.988.2.74 --- CHANGES 2 Apr 2003 04:12:55 -0000 1.988.2.73 +++ CHANGES 4 Apr 2003 00:40:56 -0000 1.988.2.74 @@ -1,6 +1,9 @@ Changes with Apache 2.0.46 - + *) mod_deflate: Check also err_headers_out for an already set + Content-Encoding: gzip header. This prevents gzip compressed content + from a CGI script from being compressed once more. PR 17797. + [Andr� Malo] Changes with Apache 2.0.45 1.751.2.201 +1 -7 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.200 retrieving revision 1.751.2.201 diff -u -r1.751.2.200 -r1.751.2.201 --- STATUS 3 Apr 2003 23:14:29 -0000 1.751.2.200 +++ STATUS 4 Apr 2003 00:40:57 -0000 1.751.2.201 @@ -158,12 +158,6 @@ modules/generators/mod_autoindex.c: r1.119 +1: nd, wrowe, trawick - * mod_deflate: Check also err_headers_out for an already set - Content-Encoding: gzip header. This prevents gzip compressed content - from a CGI script from being compressed once more. PR 17797. - modules/filters/mod_deflate.c: r1.32 - +1: nd, ianh, trawick - * mod_negotiation: parse quality values independent from the current locale and level values as integers. PR 17564. (essentially: get a rid of atof()) (2.0 + 1.3) No revision No revision 1.26.2.4 +12 -0 httpd-2.0/modules/filters/mod_deflate.c Index: mod_deflate.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v retrieving revision 1.26.2.3 retrieving revision 1.26.2.4 diff -u -r1.26.2.3 -r1.26.2.4 --- mod_deflate.c 11 Mar 2003 18:04:36 -0000 1.26.2.3 +++ mod_deflate.c 4 Apr 2003 00:40:58 -0000 1.26.2.4 @@ -329,6 +329,18 @@ */ encoding = apr_table_get(r->headers_out, "Content-Encoding"); if (encoding) { + const char *err_enc; + + err_enc = apr_table_get(r->err_headers_out, "Content-Encoding"); + if (err_enc) { + encoding = apr_pstrcat(r->pool, encoding, ",", err_enc, NULL); + } + } + else { + encoding = apr_table_get(r->err_headers_out, "Content-Encoding"); + } + + if (encoding) { const char *tmp = encoding; token = ap_get_token(r->pool, &tmp, 0);