[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 9143ad5d046d2a1c65f7901b4f22914b1107c744

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  9143ad5d046d2a1c65f7901b4f22914b1107c744 (commit)
      from  d9ade6659460c92e3316743c46988d0bc7122660 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9143ad5d046d2a1c65f7901b4f22914b1107c744
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Thu Jan 12 15:37:48 2012 -0500

    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 at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index baf0b64..22b9c21 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>
 
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/apache/eg_vhost.conf |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS