1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00

Check also for r->content_encoding (now we should have them all...)

for already compressed content in mod_deflate.

PR: 19913
Submitted by: Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
André Malo
2003-05-16 22:49:04 +00:00
parent 9ba66751f2
commit 8c039aae04
2 changed files with 9 additions and 0 deletions

View File

@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
[Remove entries to the current 2.0 section below, when backported]
*) Add another check for already compressed content in mod_deflate.
PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
*) Add a delete flag to htpasswd.
[Thom May]

View File

@@ -340,6 +340,12 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
encoding = apr_table_get(r->err_headers_out, "Content-Encoding");
}
if (r->content_encoding) {
encoding = encoding ? apr_pstrcat(r->pool, encoding, ",",
r->content_encoding, NULL)
: r->content_encoding;
}
if (encoding) {
const char *tmp = encoding;