Fix bug where we unreasonably reject konqueror's accept-encoding headers

snapframework · May 22, 2010 · cc86118 · cc86118
1 parent e1ea730
commit cc86118
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Snap/Util/GZip.hs b/src/Snap/Util/GZip.hs
@@ -298,7 +298,9 @@ acceptParser = do
         float
         return ()
 
-    coding = string "*" <|> takeWhile isAlpha_ascii
+    coding = string "*" <|> takeWhile isCodingChar
+
+    isCodingChar c = isAlpha_ascii c || c == '-'
 
     float = takeWhile isDigit >>
             option () (char '.' >> takeWhile isDigit >> pure ())

diff --git a/test/suite/Snap/Util/GZip/Tests.hs b/test/suite/Snap/Util/GZip/Tests.hs
@@ -52,7 +52,7 @@ liftQ = QC.run
 ------------------------------------------------------------------------------
 gzipHdrs, badHdrs, compressHdrs, emptyHdrs :: Headers
 emptyHdrs = Map.empty
-gzipHdrs = setHeader "Accept-Encoding" "froz,gzip" emptyHdrs
+gzipHdrs = setHeader "Accept-Encoding" "froz,gzip, x-gzip" emptyHdrs
 badHdrs = setHeader "Accept-Encoding" "*&%^&^$%&%&*^\023" emptyHdrs
 compressHdrs = setHeader "Accept-Encoding" "compress" emptyHdrs