@@ -14,6 +14,7 @@ import Data.Array ((!))
1414import Data.ByteString (ByteString)
1515import qualified Data.ByteString as B hiding (pack)
1616import qualified Data.ByteString.Char8 as B (pack, readInteger)
17+import Data.Maybe (fromMaybe)
1718import Network.HTTP.Date
1819import qualified Network.HTTP.Types as H
1920import qualified Network.HTTP.Types.Header as H
@@ -22,6 +23,10 @@ import qualified Network.Wai.Handler.Warp.FileInfoCache as I
2223import Network.Wai.Handler.Warp.Header
2324import Numeric (showInt)
2425
26+#ifndef MIN_VERSION_http_types
27+#define MIN_VERSION_http_types(x,y,z) 1
28+#endif
29+
2530----------------------------------------------------------------
2631
2732data RspFileInfo = WithoutBody H.Status
@@ -45,9 +50,7 @@ conditionalRequest finfo hs0 reqidx = case condition of
4550 mcondition = ifmodified reqidx size mtime
4651 <|> ifunmodified reqidx size mtime
4752 <|> ifrange reqidx size mtime
48− condition = case mcondition of
49− Nothing -> unconditional reqidx size
50− Just x -> x
53+ condition = fromMaybe (unconditional reqidx size) mcondition
5154
5255----------------------------------------------------------------
5356