Item13375: fixed setting the content-encoding

... under each and every circumstance
foswiki · Apr 15, 2015 · bbba93e · bbba93e
1 parent fae660e
commit bbba93e
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -1002,19 +1002,12 @@ sub generateHTTPHeaders {
     # add http compression and conditional cache controls
     if ( !$this->inContext('command_line') && $text ) {
 
-        if (
-            $Foswiki::cfg{HttpCompress}
-            && (
-                (
-                       $ENV{'HTTP_ACCEPT_ENCODING'}
-                    && $ENV{'HTTP_ACCEPT_ENCODING'} =~ m/(x-gzip|gzip)/i
-                )
-
-                || $ENV{'SPDY'}
-            )
-          )  # SMELL: non-standard way to detect spdy protocol set by web server
-        {
-            my $encoding = $1 || 'gzip';
+        if ( $Foswiki::cfg{HttpCompress}
+            && ( $ENV{'HTTP_ACCEPT_ENCODING'} || $ENV{'SPDY'} ) )
+        { # SMELL: SPDY is a non-standard way to detect spdy protocol set by web server
+            my $encoding = $ENV{'HTTP_ACCEPT_ENCODING'} || 'gzip';
+            $encoding =~ s/^.*(x-gzip|gzip).*/$1/g;
+
             $hopts->{'Content-Encoding'} = $encoding;
             $hopts->{'Vary'}             = 'Accept-Encoding';