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

[rp...@apache.org]

Author: rpluem
Date: Mon Dec 15 12:36:47 2008
New Revision: 726794

URL: http://svn.apache.org/viewvc?rev=726794&view=rev
Log:
* Fix r->content_encoding for inflate_in and inflate_out filters.

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=726794&r1=726793&r2=726794&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Mon Dec 15 12:36:47 2008
@@ -157,6 +157,15 @@
             }
         }
     }
+    /*
+     * If we have dealt with the headers above but content_encoding was set
+     * before sync it with the new value in the hdrs table as
+     * r->content_encoding takes precedence later on in the http_header_filter
+     * and hence would destroy what we have just set in the hdrs table.
+     */
+    if (hdrs && r->content_encoding) {
+        r->content_encoding = apr_table_get(hdrs, "Content-Encoding");
+    }
     return found;
 }