git.iko.soy/typeable/wai
on master help sign in
Conditional compilation to fix #479 (ping @kazu-yamamoto)
945632cMichael Snoyman
warp/Network/Wai/Handler/Warp/File.hs+15−2
compare with master
unifiedsplit
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE BangPatterns #-}
3{-# LANGUAGE BangPatterns #-}
3
4
@@ -140,7 +141,13 @@ parseByteRanges bs1 = do
140-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
141-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
141-- for the range specified.
142-- for the range specified.
142contentRangeHeader :: Integer -> Integer -> Integer -> H.Header
143contentRangeHeader :: Integer -> Integer -> Integer -> H.Header
143−contentRangeHeader beg end total = (H.hContentRange, range)
144+contentRangeHeader beg end total = (
145+#if MIN_VERSION_http_types(0,9,0)
146+ H.hContentRange
147+#else
148+ "content-range"
149+#endif
150+ , range)
144 where
151 where
145 range = B.pack
152 range = B.pack
146 -- building with ShowS
153 -- building with ShowS
@@ -157,7 +164,13 @@ addContentHeaders hs off len size = hs''
157 where
164 where
158 contentRange = contentRangeHeader off (off + len - 1) size
165 contentRange = contentRangeHeader off (off + len - 1) size
159 lengthBS = L.toStrict $ B.toLazyByteString $ B.integerDec len
166 lengthBS = L.toStrict $ B.toLazyByteString $ B.integerDec len
160− hs' = (H.hContentLength, lengthBS):(H.hAcceptRanges, "bytes"):hs
167+ hs' = (H.hContentLength, lengthBS):(
168+#if MIN_VERSION_http_types(0,9,0)
169+ H.hAcceptRanges
170+#else
171+ "accept-ranges"
172+#endif
173+ , "bytes"):hs
161 hs'' = if len == size then hs' else contentRange:hs'
174 hs'' = if len == size then hs' else contentRange:hs'
162
175
163-- |
176-- |