You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2008/12/15 21:22:08 UTC

svn commit: r726791 - /httpd/httpd/trunk/modules/filters/mod_deflate.c

Author: rpluem
Date: Mon Dec 15 12:22:07 2008
New Revision: 726791

URL: http://svn.apache.org/viewvc?rev=726791&view=rev
Log:
*  Fix r->content_encoding in deflate_out_filter if it was set before.

Modified:
    httpd/httpd/trunk/modules/filters/mod_deflate.c

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=726791&r1=726790&r2=726791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Mon Dec 15 12:22:07 2008
@@ -584,6 +584,11 @@
         else {
             apr_table_mergen(r->headers_out, "Content-Encoding", "gzip");
         }
+        /* Fix r->content_encoding if it was set before */
+        if (r->content_encoding) {
+            r->content_encoding = apr_table_get(r->headers_out,
+                                                "Content-Encoding");
+        }
         apr_table_unset(r->headers_out, "Content-Length");
         apr_table_unset(r->headers_out, "Content-MD5");
         deflate_check_etag(r, "gzip");