From: Thomas Berezansky <tsbere@mvlc.org>
Date: Thu, 12 Jan 2012 20:37:48 +0000 (-0500)
Subject: Disable mod_deflate on XMLENT filtered files
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9cf6bbd33672eef8c047dd3d2a8173cae6671a10;p=evergreen%2Fpines.git

Disable mod_deflate on XMLENT filtered files

Default configs for Ubuntu, at least, enable mod_deflate too broadly, and
XMLENT filtering needs to happen before mod_deflate kicks in.

Because we can't change the filter order, instead disable mod_deflate for
those files we have enabled XMLENT filtering, by use of the no-gzip ENV.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
---

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index baf0b64976..22b9c210cf 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -236,6 +236,7 @@ RewriteRule . - [E=locale:en-US]
     XMLEntContentType "text/html; charset=utf-8"
     AddOutputFilter INCLUDES;XMLENT .xhtml
     AddOutputFilter INCLUDES;XMLENT .html
+    SetEnv no-gzip
     allow from all
 </LocationMatch>
 
@@ -244,6 +245,7 @@ RewriteRule . - [E=locale:en-US]
     Options +Includes
     XMLEntContentType "application/vnd.mozilla.xul+xml"
     AddOutputFilter INCLUDES;XMLENT .xul
+    SetEnv no-gzip
     allow from all
 </LocationMatch>
 
@@ -574,6 +576,21 @@ RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
     LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate
     CustomLog /var/log/apache2/deflate_log deflate
+
+    # There are problems with XMLENT and mod_deflate - so lets disable it
+    # This is where we don't have a pre-existing LocationMatch directive earlier
+    <LocationMatch /opac/.*\.xml$>
+        SetEnv no-gzip
+    </LocationMatch>
+    <LocationMatch /opac/[a-z]{2}-[A-Z]{2}/extras/slimpac/.*\.html$>
+        SetEnv no-gzip
+    </LocationMatch>
+    <LocationMatch /reports/.*\.xhtml$>
+        SetEnv no-gzip
+    </LocationMatch>
+    <LocationMatch /conify/.*\.html$>
+        SetEnv no-gzip
+    </LocationMatch>
 </IfModule>